Changeset 45190 in vbox for trunk/src/VBox/Frontends

Timestamp:

Mar 26, 2013 10:59:17 AM (12 years ago)

Author:

vboxsync

Message:

VBoxManage: one more check for 'controlvm'; removed long obsolete 'gueststatisticsinterval' help

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManageControlVM.cpp (modified) (4 diffs)
• VBoxManageHelp.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp

@@ -284 +284 @@
         else if (!strcmp(a->argv[1], "keyboardputscancode"))
         {
-            ComPtr<IKeyboard> keyboard;
-            CHECK_ERROR_BREAK(console, COMGETTER(Keyboard)(keyboard.asOutParam()));
+            ComPtr<IKeyboard> pKeyboard;
+            CHECK_ERROR_BREAK(console, COMGETTER(Keyboard)(pKeyboard.asOutParam()));
+            if (!pKeyboard)
+            {
+                RTMsgError("Guest not running");
+                rc = E_FAIL;
+                break;
+            }
 
             if (a->argc <= 1 + 1)
@@ -329 +335 @@
             com::SafeArray<LONG> saScancodes(llScancodes);
             ULONG codesStored = 0;
-            CHECK_ERROR_BREAK(keyboard, PutScancodes(ComSafeArrayAsInParam(saScancodes),
+            CHECK_ERROR_BREAK(pKeyboard, PutScancodes(ComSafeArrayAsInParam(saScancodes),
                                                      &codesStored));
             if (codesStored < saScancodes.size())
@@ -1003 +1009 @@
             if (!pDisplay)
             {
-                RTMsgError("Cannot send a video mode hint without a display");
+                RTMsgError("Guest not running");
                 rc = E_FAIL;
                 break;
@@ -1310 +1316 @@
             if (!pDisplay)
             {
-                RTMsgError("Cannot take a screenshot without a display");
+                RTMsgError("Guest not running");
                 rc = E_FAIL;
                 break;

trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp

@@ -268 +268 @@
 #endif
                      "                            [--guestmemoryballoon <balloonsize in MB>]\n"
-                     "                            [--gueststatisticsinterval <seconds>]\n"
                      "                            [--audio none|null", SEP);
         if (fWin)
@@ -446 +445 @@
                      "                            natpf<1-N> delete <rulename> |\n"
                      "                            guestmemoryballoon <balloonsize in MB> |\n"
-                     "                            gueststatisticsinterval <seconds> |\n"
                      "                            usbattach <uuid>|<address> |\n"
                      "                            usbdetach <uuid>|<address> |\n"