Changeset 776

Timestamp:

Aug 4, 2010, 6:11:00 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Fixed assertion shown when dragging the "Computer" item in the side bar of the file dialog.

File:

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

trunk/src/gui/kernel/qmime_pm.cpp

@@ -2255 +2255 @@
 
         int sep = fileName.lastIndexOf('\\');
-        Q_ASSERT(sep > 0 && sep < fileName.length() - 1);
-        if (sep <= 0 || sep >= fileName.length() - 1) {
-            ok = false;
-            break;
-        }
-
-        item->hstrSourceName = DrgAddStrHandle(fileName.data() + sep + 1);
-        fileName.truncate(sep + 1);
-        item->hstrContainerName = DrgAddStrHandle(fileName);
+
+        if (sep >= 0) {
+            item->hstrSourceName = DrgAddStrHandle(fileName.data() + sep + 1);
+            fileName.truncate(sep + 1);
+            item->hstrContainerName = DrgAddStrHandle(fileName);
+        } else {
+            // we got an URL like "file:" which corresponds to the "Computer"
+            // bookmark in the side bar of the standard file dialog. We have to
+            // deal with that too
+            item->hstrSourceName = DrgAddStrHandle(fileName.data());
+            item->hstrContainerName = DrgAddStrHandle("");
+        }
 
         DEBUG(() << "QPMMimeText::NativeFileDrag: item" << i