Changeset 57129 in vbox

Timestamp:

Jul 30, 2015 12:57:20 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

101867

Message:

FE/Qt: 7962: Runtime UI: Manually cleanup session connections early for machine-window(s) as well; same as r101866, unrelated to crash but useful.

Location:

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

Files:

• UIMachineWindow.cpp (modified) (2 diffs)
• UIMachineWindow.h (modified) (1 diff)
• normal/UIMachineWindowNormal.cpp (modified) (2 diffs)
• normal/UIMachineWindowNormal.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp

@@ -444 +444 @@
 void UIMachineWindow::prepareSessionConnections()
 {
-    /* Machine state-change updater: */
+    /* We should watch for console events: */
     connect(uisession(), SIGNAL(sigMachineStateChange()), this, SLOT(sltMachineStateChanged()));
 }
@@ -523 +523 @@
     UIMachineView::destroy(m_pMachineView);
     m_pMachineView = 0;
+}
+
+void UIMachineWindow::cleanupSessionConnections()
+{
+    /* We should stop watching for console events: */
+    disconnect(uisession(), SIGNAL(sigMachineStateChange()), this, SLOT(sltMachineStateChanged()));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.h

@@ -148 +148 @@
     virtual void cleanupMenu() {}
     virtual void cleanupMainLayout() {}
-    virtual void cleanupSessionConnections() {}
+    virtual void cleanupSessionConnections();
 
     /* Update stuff: */

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

@@ -214 +214 @@
     UIMachineWindow::prepareSessionConnections();
 
-    /* Medium change updater: */
+    /* We should watch for console events: */
     connect(machineLogic()->uisession(), SIGNAL(sigMediumChange(const CMediumAttachment &)),
             this, SLOT(sltMediumChange(const CMediumAttachment &)));
-
-    /* USB controller change updater: */
     connect(machineLogic()->uisession(), SIGNAL(sigUSBControllerChange()),
             this, SLOT(sltUSBControllerChange()));
-
-    /* USB device state-change updater: */
     connect(machineLogic()->uisession(), SIGNAL(sigUSBDeviceStateChange(const CUSBDevice &, bool, const CVirtualBoxErrorInfo &)),
             this, SLOT(sltUSBDeviceStateChange()));
-
-    /* Network adapter change updater: */
     connect(machineLogic()->uisession(), SIGNAL(sigNetworkAdapterChange(const CNetworkAdapter &)),
             this, SLOT(sltNetworkAdapterChange()));
-
-    /* Shared folder change updater: */
     connect(machineLogic()->uisession(), SIGNAL(sigSharedFolderChange()),
             this, SLOT(sltSharedFolderChange()));
-
-    /* Video capture change updater: */
     connect(machineLogic()->uisession(), SIGNAL(sigVideoCaptureChange()),
             this, SLOT(sltVideoCaptureChange()));
-
-    /* CPU execution cap change updater: */
     connect(machineLogic()->uisession(), SIGNAL(sigCPUExecutionCapChange()),
             this, SLOT(sltCPUExecutionCapChange()));
@@ -402 +390 @@
     /* Call to base-class: */
     UIMachineWindow::saveSettings();
+}
+
+void UIMachineWindowNormal::cleanupSessionConnections()
+{
+    /* We should stop watching for console events: */
+    disconnect(machineLogic()->uisession(), SIGNAL(sigMediumChange(const CMediumAttachment &)),
+               this, SLOT(sltMediumChange(const CMediumAttachment &)));
+    disconnect(machineLogic()->uisession(), SIGNAL(sigUSBControllerChange()),
+               this, SLOT(sltUSBControllerChange()));
+    disconnect(machineLogic()->uisession(), SIGNAL(sigUSBDeviceStateChange(const CUSBDevice &, bool, const CVirtualBoxErrorInfo &)),
+               this, SLOT(sltUSBDeviceStateChange()));
+    disconnect(machineLogic()->uisession(), SIGNAL(sigNetworkAdapterChange(const CNetworkAdapter &)),
+               this, SLOT(sltNetworkAdapterChange()));
+    disconnect(machineLogic()->uisession(), SIGNAL(sigSharedFolderChange()),
+               this, SLOT(sltSharedFolderChange()));
+    disconnect(machineLogic()->uisession(), SIGNAL(sigVideoCaptureChange()),
+               this, SLOT(sltVideoCaptureChange()));
+    disconnect(machineLogic()->uisession(), SIGNAL(sigCPUExecutionCapChange()),
+               this, SLOT(sltCPUExecutionCapChange()));
+
+    /* Call to base-class: */
+    UIMachineWindow::cleanupSessionConnections();
 }
 

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

@@ -97 +97 @@
     /** Save settings routine. */
     void saveSettings();
+    /** Cleanup session connections routine. */
+    void cleanupSessionConnections();
 
     /** Updates visibility according to visual-state. */