Changeset 21842 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jul 28, 2009 1:44:57 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: Fixing quite old crash happening if going f/s mode just when starting VM and exiting f/s mode later.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxConsoleWnd.h (modified) (2 diffs)
• src/VBoxConsoleWnd.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxConsoleWnd.h

@@ -37 +37 @@
 #include <QDialog>
 #include <QMenu>
+#include <QPointer>
 
 #ifdef VBOX_WITH_DEBUGGER_GUI
@@ -377 +378 @@
     bool mIsWaitingModeResize : 1;
     bool was_max : 1;
-    QObjectList hidden_children;
+    QList < QPointer <QWidget> > mHiddenChildren;
     int console_style;
     QPalette mErasePalette;

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

@@ -2259 +2259 @@
 
     AssertReturn (console, false);
-    AssertReturn ((hidden_children.isEmpty() == aOn), false);
+    AssertReturn ((mHiddenChildren.empty() == aOn), false);
     AssertReturn ((aSeamless && mIsSeamless != aOn) ||
                   (!aSeamless && mIsFullscreen != aOn), false);
@@ -2375 +2375 @@
                 {
                     w->hide();
-                    hidden_children.append (w);
+                    mHiddenChildren.append (w);
                 }
             }
@@ -2428 +2428 @@
 
         /* Show everything hidden when going fullscreen. */
-        foreach (QObject *obj, hidden_children)
-            ((QWidget *) obj)->show();
-        hidden_children.clear();
+        foreach (QPointer <QWidget> child, mHiddenChildren)
+            if (child) child->show();
+        mHiddenChildren.clear();
     }