Changeset 89109 in vbox

Timestamp:

May 17, 2021 3:51:48 PM (4 years ago)

Author:

vboxsync

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

144450

Message:

FE/Qt: bugref:8161. Cleaning file manager COM stuff earlier

Location:

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl

Files:

• UIFileManager.cpp (modified) (2 diffs)
• UIFileManager.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManager.cpp

@@ -136 +136 @@
     UIFileManagerOptions::create();
     uiCommon().setHelpKeyword(this, "guestadd-gc-file-manager");
+    connect(&uiCommon(), &UICommon::sigAskToDetachCOM, this, &UIFileManager::sltCleanupListenerAndGuest);
 }
 
 UIFileManager::~UIFileManager()
 {
-    if (m_comGuest.isOk() && m_pQtGuestListener && m_comGuestListener.isOk())
-        cleanupListener(m_pQtGuestListener, m_comGuestListener, m_comGuest.GetEventSource());
-    if (m_comGuestSession.isOk() && m_pQtSessionListener && m_comSessionListener.isOk())
-        cleanupListener(m_pQtSessionListener, m_comSessionListener, m_comGuestSession.GetEventSource());
-
-    if (m_comGuestSession.isOk())
-        m_comGuestSession.Close();
-
     saveOptions();
     UIFileManagerOptions::destroy();
@@ -537 +530 @@
 }
 
+void UIFileManager::sltCleanupListenerAndGuest()
+{
+    if (m_comGuest.isOk() && m_pQtGuestListener && m_comGuestListener.isOk())
+        cleanupListener(m_pQtGuestListener, m_comGuestListener, m_comGuest.GetEventSource());
+    if (m_comGuestSession.isOk() && m_pQtSessionListener && m_comSessionListener.isOk())
+        cleanupListener(m_pQtSessionListener, m_comSessionListener, m_comGuestSession.GetEventSource());
+
+    if (m_comGuestSession.isOk())
+        m_comGuestSession.Close();
+}
+
 void UIFileManager::copyToHost()
 {

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManager.h

@@ -120 +120 @@
     void sltHandleOptionsUpdated();
     void sltHandleHidePanel(UIDialogPanel *pPanel);
+    void sltCleanupListenerAndGuest();
 
 private: