Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestProp.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestProp.cpp	(revision 22912)
+++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestProp.cpp	(revision 22913)
@@ -459,11 +459,19 @@
     }
     a->virtualBox->RegisterCallback(callback);
-
+    RTTIMESPEC tmStarted, tmNow;
+    RTTimeNow (&tmStarted);
     do {
-      int vrc = com::EventQueue::getMainEventQueue()->processEventQueue(1000);
+      int vrc = com::EventQueue::getMainEventQueue()->processEventQueue(300);
       if (RT_FAILURE(vrc) && vrc != VERR_TIMEOUT)
       {
           RTPrintf("Error waiting for event: %Rrc\n", vrc);
           return 1;
+      }
+      if (cMsTimeout != RT_INDEFINITE_WAIT)
+      {
+        RTTimeNow(&tmNow);
+        RTTimeSpecSub(&tmNow, &tmStarted);
+        if (RTTimeSpecGetMilli(&tmNow) >= cMsTimeout)
+            break;
       }
     } while  (!cbImpl->Signalled());
@@ -509,3 +517,2 @@
     return errorSyntax(USAGE_GUESTPROPERTY, "Incorrect parameters");
 }
-