Changeset 808 for trunk/src/gui/kernel/qwidget_pm.cpp

Timestamp:

Oct 27, 2010, 6:11:22 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Fixed a crash that could happen at program termination in Dive mode if a top-level window had a native HWND window embedded in it. This was partly a r775 regression and also supersedes this change at all. Closes #184.

File:

• trunk/src/gui/kernel/qwidget_pm.cpp (modified) (2 diffs)

trunk/src/gui/kernel/qwidget_pm.cpp

@@ -1390 +1390 @@
         if (destroyWindow && !(windowType() == Qt::Desktop) &&
             d->frameWinId() != NULLHANDLE) {
-            // make sure the backing store is deleted before destroying HWND --
-            // QPMDiveWindowSurface depends on that
-            delete d->topData()->backingStore;
-            d->topData()->backingStore = 0;
-            // now destroy HWND
+            // destroy HWND
             HWND id = d->frameWinId();
 #if defined(QT_DEBUGWINCREATEDESTROY)
@@ -1470 +1466 @@
 
     if (old_fid != NULLHANDLE && q->windowType() != Qt::Desktop) {
-        // make sure the backing store is deleted before destroying HWND --
-        // QPMDiveWindowSurface depends on that
-        if (extra && extra->topextra) {
-            delete extra->topextra->backingStore;
-            extra->topextra->backingStore = 0;
-            // zero the to-be-destroyed frame HWND just in case
-            extra->topextra->fId = NULLHANDLE;
-        }
-        // now destroy HWND
+        // destroy HWND
         qt_WinDestroyWindow(old_fid);
     }