Changeset 56900 in vbox

Timestamp:

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

Author:

vboxsync

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

101578

Message:

DnD: DNDDIRDROPPEDFILES: Track directory open status internally.

Location:

trunk

Files:

• include/VBox/GuestHost/DragAndDrop.h (modified) (2 diffs)
• src/VBox/GuestHost/DragAndDrop/DnDDir.cpp (modified) (3 diffs)

trunk/include/VBox/GuestHost/DragAndDrop.h

@@ -41 +41 @@
  * Structure for maintaining a "dropped files" directory
  * on the host or guest. This will contain all received files & directories
- * for a single transfer.
+ * for a single drag and drop operation.
  */
 typedef struct DNDDIRDROPPEDFILES
@@ -47 +47 @@
     /** Directory handle for drop directory. */
     PRTDIR                       hDir;
+    /** Flag indicating whether the drop directory
+     *  has been opened for processing or not. */
+    bool                         fOpen;
     /** Absolute path to drop directory. */
     RTCString                    strPathAbs;

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. */