Changeset 2055 in vbox for trunk

Timestamp:

Apr 12, 2007 4:28:13 PM (18 years ago)

Author:

vboxsync

Message:

FE/Qt: Fixed a debug assertion when a global GUI configuration key had an invalid value in the settings file.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxGlobal.cpp (modified) (3 diffs)
• VBoxProblemReporter.cpp (modified) (1 diff)

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

@@ -639 +639 @@
 #endif
 
+    Assert (valid);
+
     if (!selector_wnd)
     {
@@ -668 +670 @@
 #endif
 
-    if ( !console_wnd )
+    Assert (valid);
+
+    if (!console_wnd)
     {
         /*
@@ -1307 +1311 @@
 bool VBoxGlobal::startMachine (const QUuid &id)
 {
-    Assert (valid);
-    if (!valid)
-        return false;
+    AssertReturn (valid, false);
 
     CSession session;

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

@@ -414 +414 @@
 QWidget *VBoxProblemReporter::mainWindowShown()
 {
+    /* It may happen that this method is called during VBoxGlobal
+     * initialization or even after it failed (for example, to show some
+     * error message). Return no main window in this case. */
+    if (!vboxGlobal().isValid())
+        return 0;
+
 #if defined (VBOX_GUI_SEPARATE_VM_PROCESS)
     if (vboxGlobal().isVMConsoleProcess())