Changeset 8845 in vbox for trunk/src/VBox

Timestamp:

May 15, 2008 12:32:16 PM (17 years ago)

Author:

vboxsync

Message:

FE/Qt4: If the vm is externally or internally powered off close the vm window in any case.

File:

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

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

@@ -1243 +1243 @@
         e->ignore();
 
-        /* Disable auto closure because we want to have a chance to show the
-         * error dialog on save state / power off failure. */
-        no_auto_close = true;
-
         bool success = true;
 
@@ -1299 +1295 @@
             if (dlg.exec() == QDialog::Accepted)
             {
+                /* Disable auto closure because we want to have a chance to show the
+                 * error dialog on save state / power off failure. */
+                no_auto_close = true;
+
                 CConsole cconsole = console->console();
 
@@ -3367 +3367 @@
 {
 #warning "port me"
-    /* It seems that Qt4 closes all child widgets if the parent widget get
-     * closed. So nothing to do here than to call close. */
-     
-     close();
-
-    /* We have this to test on Windows and Mac or maybe I forgot something, so
-     * we keep this as a reference: */
+    /* First close any open modal & popup widgets. Use a single shot with
+     * timeout 0 to allow the widgets to cleany close and test then again. If
+     * all open widgets are closed destroy ourself. */
+    QWidget *widget = QApplication::activeModalWidget();
+    if (widget)
+    {
+        widget->close();
+        QTimer::singleShot (0, this, SLOT (tryClose()));
+    }
+    else
+    {
+        widget = QApplication::activePopupWidget();
+        if (widget)
+        {
+            widget->close();
+            QTimer::singleShot (0, this, SLOT (tryClose()));
+        }
+        else
+            close();
+    }
+
+    /* We have this to test on Windows or maybe I forgot something, so we keep
+     * this as a reference: */
 //    LogFlowFunc (("eventLoopLevel=%d\n", qApp->eventLoop()->loopLevel()));
 //