Changeset 27252 in vbox for trunk/src/VBox

Timestamp:

Mar 10, 2010 2:53:19 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: New running VM core: do not wait for fullscreen/seamless mode exit on machine poweroff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• fullscreen/UIMachineViewFullscreen.cpp (modified) (1 diff)
• seamless/UIMachineViewSeamless.cpp (modified) (1 diff)

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

@@ -240 +240 @@
 void UIMachineViewFullscreen::cleanupFullscreen()
 {
-    if (m_bIsGuestAutoresizeEnabled && uisession()->isGuestSupportsGraphics())
-    {
-        /* Rollback fullscreen frame-buffer size to normal: */
-        machineWindowWrapper()->machineWindow()->hide();
-        UIMachineViewBlocker blocker(this);
-        sltPerformGuestResize(uisession()->guestSizeHint(screenId()));
-        blocker.exec();
+    /* If machine still running: */
+    if (uisession()->isRunning())
+    {
+        /* And guest supports advanced graphics management which is enabled: */
+        if (m_bIsGuestAutoresizeEnabled && uisession()->isGuestSupportsGraphics())
+        {
+            /* Rollback fullscreen frame-buffer size to normal: */
+            machineWindowWrapper()->machineWindow()->hide();
+            UIMachineViewBlocker blocker(this);
+            sltPerformGuestResize(uisession()->guestSizeHint(screenId()));
+            blocker.exec();
+        }
     }
 }

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

@@ -259 +259 @@
 void UIMachineViewSeamless::cleanupSeamless()
 {
-    /* Reset seamless feature flag of the guest: */
+    /* If machine still running: */
     if (uisession()->isRunning())
+    {
+        /* Reset seamless feature flag of the guest: */
         session().GetConsole().GetDisplay().SetSeamlessMode(false);
 
-    /* Rollback seamless frame-buffer size to normal: */
-    machineWindowWrapper()->machineWindow()->hide();
-    UIMachineViewBlocker blocker(this);
-    sltPerformGuestResize(uisession()->guestSizeHint(screenId()));
-    blocker.exec();
+        /* Rollback seamless frame-buffer size to normal: */
+        machineWindowWrapper()->machineWindow()->hide();
+        UIMachineViewBlocker blocker(this);
+        sltPerformGuestResize(uisession()->guestSizeHint(screenId()));
+        blocker.exec();
+    }
 }