Changeset 459 for trunk/src

Timestamp:

Jan 21, 2010, 3:58:12 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: DnD: Fixed: Don't delete the source file carrying the drag data if we didn't create it (which is the case for native RMFs such as DRM_OS2FILE).

File:

• trunk/src/gui/kernel/qmime_pm.cpp (modified) (4 diffs)

trunk/src/gui/kernel/qmime_pm.cpp

@@ -638 +638 @@
             return (MRESULT)FALSE;
 
-        DEBUG(() << "DefaultDragWorker: Got DM_ENDCONVERSATION for item " << req->index
-                 << " (id " << itemId << ") provider" << req->provider
+        DEBUG(() << "DefaultDragWorker: Got DM_ENDCONVERSATION for item" << req->index
+                 << "(id " << itemId << ") provider" << req->provider
                  << "drm" << req->drm << "drf" << req->drf
                  << "rendered" << req->rendered << "outdated" << !d->isInitialized());
@@ -948 +948 @@
                 d->sending_DM_RENDER = true;
                 mrc = DrgSendTransferMsg(item->hwndItem, DM_RENDER,
-                                         MPFROMP (xfer), 0);
+                                         MPFROMP(xfer), 0);
                 d->sending_DM_RENDER = false;
                 DEBUG(("DefaultDropWorker: Finisned Sending DM_RENDER\n"
@@ -980 +980 @@
             }
         } else {
-            DEBUG(() << "DefaultDropWorker: Source supports <DRM_OS2FILE,"
+            DEBUG(() << "DefaultDropWorker: Source supports <DRM_OS2FILE,"
                      << drf << "> and provides a file" << srcFileName
                      << "for item" << item << "(no need to render)");
@@ -996 +996 @@
                     file.close();
                 }
-                bool ok = file.remove();
-                Q_ASSERT((ok = ok));
-                Q_UNUSED(ok);
+                if (needToTalk) {
+                    // only delete the file if we provided it for rendering
+                    bool ok = file.remove();
+                    Q_ASSERT((ok = ok));
+                    Q_UNUSED(ok);
+                }
             } else {
                 Q_ASSERT(xfer->hstrRenderToName);