Changeset 4128 in vbox

Timestamp:

Aug 13, 2007 11:40:37 AM (18 years ago)

Author:

vboxsync

Message:

2079: Create seamless mode for Windows guests:

Fixing crash during exiting the Seamless Mode after VM was restored (with Seamless activated).
It's a timing problem caused due to the Finalize Open View procedure is not finished yet when the additions are notify the host they have seamless support. So the host entering the Seamless Mode just before the Open View is finished resulting temporary "progressbar" object pointer is stored in hidden children array. When the user leaves the Seamless Mode this pointer is used during show all the hidden children.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxConsoleWnd.h (modified) (1 diff)
• src/VBoxConsoleWnd.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxConsoleWnd.h

@@ -302 +302 @@
     QColor erase_color;
 
+    bool mIsOpenViewFinished : 1;
     bool mIsFirstTimeStarted : 1;
     bool mIsAutoSaveMedia : 1;

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

@@ -219 +219 @@
     , was_max (false)
     , console_style (0)
+    , mIsOpenViewFinished (false)
     , mIsFirstTimeStarted (false)
     , mIsAutoSaveMedia (true)
@@ -993 +994 @@
 #endif
 
+    /* If seamless mode should be enabled then check if it is enabled
+     * currently and re-enable it if seamless is supported */
+    if (vmSeamlessAction->isOn() && mIsSeamlessSupported)
+        vmSeamless (true);
+    mIsOpenViewFinished = true;
     LogFlowFuncLeave();
 }
@@ -2853 +2859 @@
 void VBoxConsoleWnd::updateAdditionsState (const QString &aVersion,
                                            bool aActive,
-                                           bool aSeamless)
+                                           bool aSeamlessSupported)
 {
     vmAutoresizeGuestAction->setEnabled (aActive);
-    vmSeamlessAction->setEnabled (aSeamless);
-    mIsSeamlessSupported = aSeamless;
-    if (aSeamless && vmSeamlessAction->isOn())
-        vmSeamless (true);
+    vmSeamlessAction->setEnabled (aSeamlessSupported);
+    mIsSeamlessSupported = aSeamlessSupported;
+    /* If seamless mode should be enabled then check if it is enabled
+     * currently and re-enable it if open-view procedure is finished */
+    if (vmSeamlessAction->isOn() && mIsOpenViewFinished)
+        aSeamlessSupported ? vmSeamless (true) : vmSeamless (false);
 
     /* Check the GA version only in case of additions are active */