Changeset 58578 in vbox

Timestamp:

Nov 5, 2015 1:17:02 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

103936

Message:

Main/glue/NativeEventQueue.cpp: fix too pessimistic return value if the waiting was successful (especially the VINF_INTERRUPTED case triggered sometimes by valgrind) and use the same error handling on Darwin and all other platforms using XPCOM

File:

• trunk/src/VBox/Main/glue/NativeEventQueue.cpp (modified) (1 diff)

trunk/src/VBox/Main/glue/NativeEventQueue.cpp

@@ -521 +521 @@
         /** @todo check how Ctrl-C works on Darwin. */
         rc = waitForEventsOnDarwin(cMsTimeout);
-        if (rc == VERR_TIMEOUT)
-            rc = processPendingEvents(mEventQ);
 # else // !RT_OS_DARWIN
         rc = waitForEventsOnXPCOM(mEventQ, cMsTimeout);
+# endif // !RT_OS_DARWIN
         if (    RT_SUCCESS(rc)
             ||  rc == VERR_TIMEOUT)
-            rc = processPendingEvents(mEventQ);
-# endif // !RT_OS_DARWIN
+        {
+            int rc2 = processPendingEvents(mEventQ);
+            /* If the wait was successful don't fail the whole operation. */
+            if (RT_FAILURE(rc) && RT_FAILURE(rc2))
+                rc = rc2;
+        }
     }