Changeset 460 for trunk

Timestamp:

Jan 21, 2010, 4:21:47 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: DnD: Fixed: The "container" part of the drag item representing the file name could lack the trailing slash.

File:

• trunk/src/gui/kernel/qmime_pm.cpp (modified) (1 diff)

trunk/src/gui/kernel/qmime_pm.cpp

@@ -1546 +1546 @@
         return fullName;
 
-    fullName.resize(pathLen + nameLen);
+    // Take into account that the container name may lack the trailing slash
+    fullName.resize(pathLen + nameLen + 1);
+
     DrgQueryStrName(item->hstrContainerName, pathLen + 1, fullName.data());
+    if (fullName.at(pathLen - 1) != '\\') {
+        fullName[(size_t)pathLen] = '\\';
+        ++pathLen;
+    }
+
     DrgQueryStrName(item->hstrSourceName, nameLen + 1, fullName.data() + pathLen);
+
+    fullName.truncate(qstrlen(fullName));
 
     return fullName;