Changeset 27130 in vbox for trunk

Timestamp:

Mar 6, 2010 12:39:30 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: new core: fix for the old code on OSX

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• main.cpp (modified) (1 diff)
• runtime/fullscreen/UIMachineWindowFullscreen.cpp (modified) (1 diff)
• runtime/normal/UIMachineWindowNormal.cpp (modified) (1 diff)
• runtime/seamless/UIMachineWindowSeamless.cpp (modified) (1 diff)

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

@@ -499 +499 @@
                 }
 #endif
+                vboxGlobal().setMainWindow (vboxGlobal().vmWindow());
                 if (vboxGlobal().startMachine (vboxGlobal().managedVMUuid()))
-                {
-                    vboxGlobal().setMainWindow (vboxGlobal().vmWindow());
                     rc = a.exec();
-                }
             }
             else if (noSelector)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp

@@ -44 +44 @@
     /* "This" is machine window: */
     m_pMachineWindow = this;
+
+    /* Set the main window in VBoxGlobal */
+    if (uScreenId == 0)
+        vboxGlobal().setMainWindow(this);
 
     /* Prepare window icon: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp

@@ -51 +51 @@
     m_pMachineWindow = this;
 
+    /* Set the main window in VBoxGlobal */
+    if (uScreenId == 0)
+        vboxGlobal().setMainWindow(this);
+
     /* Prepare window icon: */
     prepareWindowIcon();

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp

@@ -45 +45 @@
     /* "This" is machine window: */
     m_pMachineWindow = this;
+
+    /* Set the main window in VBoxGlobal */
+    if (uScreenId == 0)
+        vboxGlobal().setMainWindow(this);
 
     /* Prepare window icon: */