Changeset 56900 in vbox for trunk/src/VBox

Timestamp:

Jul 9, 2015 2:24:26 PM (9 years ago)

Author:

vboxsync

Message:

DnD: DNDDIRDROPPEDFILES: Track directory open status internally.

File:

• trunk/src/VBox/GuestHost/DragAndDrop/DnDDir.cpp (modified) (3 diffs)

trunk/src/VBox/GuestHost/DragAndDrop/DnDDir.cpp

@@ -97 +97 @@
             pDir->hDir       = phDir;
             pDir->strPathAbs = pszDropDir;
+            pDir->fOpen      = true;
         }
     }
@@ -125 +126 @@
     AssertPtrReturn(pDir, VERR_INVALID_POINTER);
 
-    int rc = RTDirClose(pDir->hDir);
+    int rc = VINF_SUCCESS;
+    if (pDir->fOpen)
+    {
+        rc = RTDirClose(pDir->hDir); 
+        if (RT_SUCCESS(rc))
+            pDir->fOpen = false;
+    }
     if (RT_SUCCESS(rc))
     {
@@ -131 +138 @@
         pDir->lstFiles.clear();
 
-        if (fRemove)
+        if (   fRemove
+            && pDir->strPathAbs.isNotEmpty())
         {
             /* Try removing the (empty) drop directory in any case. */