Changeset 15268 in vbox for trunk/src/VBox/Frontends

Timestamp:

Dec 10, 2008 5:27:17 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: 3304: "Warning during VM exit": fixed segfault when closing VBox Console as the result of 40292. Have to check with Qt 4.4.x.

File:

• trunk/src/VBox/Frontends/VirtualBox4/src/VBoxConsoleWnd.cpp (modified) (4 diffs)

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

@@ -706 +706 @@
 VBoxConsoleWnd::~VBoxConsoleWnd()
 {
+    closeView();
+
 #ifdef Q_WS_MAC
     /* release the dock images */
@@ -1130 +1132 @@
     }
 
-    idle_timer->stop();
-    idle_timer->disconnect (SIGNAL (timeout()), this, SLOT (updateDeviceLights()));
-
-    hide();
-
-    /* save the position of the window and some options */
-    {
-        CMachine machine = csession.GetMachine();
-        QString winPos = QString ("%1,%2,%3,%4")
-            .arg (mNormalGeo.x()).arg (mNormalGeo.y())
-            .arg (mNormalGeo.width()).arg (mNormalGeo.height());
-        if (isMaximized() || (mIsFullscreen && was_max)
-                          || (mIsSeamless && was_max))
-            winPos += QString (",%1").arg (VBoxDefs::GUI_LastWindowPosition_Max);
-
-        machine.SetExtraData (VBoxDefs::GUI_LastWindowPosition, winPos);
-
-        machine.SetExtraData (VBoxDefs::GUI_Fullscreen,
-                              mVmFullscreenAction->isChecked() ? "on" : "off");
-        machine.SetExtraData (VBoxDefs::GUI_Seamless,
-                              mVmSeamlessAction->isChecked() ? "on" : "off");
-        machine.SetExtraData (VBoxDefs::GUI_AutoresizeGuest,
-                              mVmAutoresizeGuestAction->isChecked() ? "on" : "off");
-    }
-
-#ifdef VBOX_WITH_DEBUGGER_GUI
-    /* close & destroy the debugger gui */
-    dbgDestroy();
-#endif
-    /* Make sure all events are delievered */
-    qApp->processEvents();
-
     console->detach();
-
     centralWidget()->layout()->removeWidget (console);
     delete console;
@@ -1169 +1138 @@
     csession.Close();
     csession.detach();
-    emit closing();
 
     LogFlowFuncLeave();
@@ -1570 +1538 @@
         vboxGlobal().selectorWnd().show();
 #endif
-        QTimer::singleShot (0, this, SLOT (closeView()));
+
+        /* Stop LED update timer */
+        idle_timer->stop();
+        idle_timer->disconnect (SIGNAL (timeout()), this, SLOT (updateDeviceLights()));
+
+        /* Hide console window */
+        hide();
+
+        /* Save the position of the window and some options */
+        CMachine machine = csession.GetMachine();
+        QString winPos = QString ("%1,%2,%3,%4")
+            .arg (mNormalGeo.x()).arg (mNormalGeo.y())
+            .arg (mNormalGeo.width()).arg (mNormalGeo.height());
+        if (isMaximized() || (mIsFullscreen && was_max)
+                          || (mIsSeamless && was_max))
+            winPos += QString (",%1").arg (VBoxDefs::GUI_LastWindowPosition_Max);
+
+        machine.SetExtraData (VBoxDefs::GUI_LastWindowPosition, winPos);
+
+        machine.SetExtraData (VBoxDefs::GUI_Fullscreen,
+                              mVmFullscreenAction->isChecked() ? "on" : "off");
+        machine.SetExtraData (VBoxDefs::GUI_Seamless,
+                              mVmSeamlessAction->isChecked() ? "on" : "off");
+        machine.SetExtraData (VBoxDefs::GUI_AutoresizeGuest,
+                              mVmAutoresizeGuestAction->isChecked() ? "on" : "off");
+
+#ifdef VBOX_WITH_DEBUGGER_GUI
+        /* Close & destroy the debugger GUI */
+        dbgDestroy();
+#endif
+
+        /* Make sure all events are delievered */
+        qApp->processEvents();
+
+        /* Notify all the top-level dialogs about closing */
+        emit closing();
     }