Changeset 56494 in vbox

Timestamp:

Jun 18, 2015 10:28:28 AM (9 years ago)

Author:

vboxsync

Message:

DnD: GuestDnDPrivate.cpp: Don't bail out too early when waiting for guest callback events, additional (release) logging.

File:

• trunk/src/VBox/Main/src-client/GuestDnDPrivate.cpp (modified) (4 diffs)

trunk/src/VBox/Main/src-client/GuestDnDPrivate.cpp

@@ -835 +835 @@
 int GuestDnDBase::sendCancel(void)
 {
-    LogFlowFunc(("Generating cancel request ...\n"));
-
     int rc;
     try
@@ -850 +848 @@
     }
 
+    LogFlowFunc(("Generated cancelling request, rc=%Rrc\n", rc));
     return rc;
 }
@@ -874 +873 @@
         }
         else if (rc == VERR_TIMEOUT) /* Continue waiting. */
-            continue;
+            rc = VINF_SUCCESS;
 
         if (   msTimeout != RT_INDEFINITE_WAIT
@@ -880 +879 @@
         {
             rc = VERR_TIMEOUT;
-            LogFlowFunc(("Guest did not respond within time\n"));
+            LogRel2(("DnD: Error: Guest did not respond within time\n"));
         }
         else if (pResp->isProgressCanceled()) /** @todo GuestDnDResponse *pResp needs to go. */
         {
-            LogFlowFunc(("Canceled by user\n"));
+            LogRel2(("DnD: Operation was canceled by user\n"));
             rc = VERR_CANCELLED;
         }