Changeset 102552 in vbox

Timestamp:

Dec 8, 2023 4:41:52 PM (15 months ago)

Author:

vboxsync

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

160698

Message:

FE/Qt: bugref:10570: UIMachineLogic: Fixing app shutdown hangs caused by Session Information and Soft Keyboard dialogs; This must be something new caused by changed Qt6 closeEvent handling, we have seen lots of such things already.

Location:

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

Files:

• UIMachineLogic.cpp (modified) (3 diffs)
• UIMachineLogic.h (modified) (2 diffs)

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

@@ -1666 +1666 @@
         m_pVMInformationDialog->setWindowState(m_pVMInformationDialog->windowState() & ~Qt::WindowMinimized);
         m_pVMInformationDialog->activateWindow();
-        connect(m_pVMInformationDialog, &UIVMInformationDialog::sigClose, this, &UIMachineLogic::sltCloseInformationDialogDefault);
-    }
-}
-
-void UIMachineLogic::sltCloseInformationDialog(bool fAsync /* = false */)
-{
-    if (!m_pVMInformationDialog)
-        return;
-    if (fAsync)
-        m_pVMInformationDialog->deleteLater();
-    else
-        delete m_pVMInformationDialog;
+        connect(m_pVMInformationDialog, &UIVMInformationDialog::sigClose,
+                this, &UIMachineLogic::sltCloseInformationDialog);
+    }
+}
+
+void UIMachineLogic::sltCloseInformationDialog()
+{
+    delete m_pVMInformationDialog;
     m_pVMInformationDialog = 0;
 }
@@ -2044 +2040 @@
         QWidget *pCenterWidget = windowManager().realParentWindow(activeMachineWindow());
         m_pSoftKeyboardDialog = new UISoftKeyboard(0, uimachine(), pCenterWidget, uimachine()->machineName());
-        connect(m_pSoftKeyboardDialog, &UISoftKeyboard::sigClose, this, &UIMachineLogic::sltCloseSoftKeyboardDefault);
+        connect(m_pSoftKeyboardDialog, &UISoftKeyboard::sigClose,
+                this, &UIMachineLogic::sltCloseSoftKeyboard);
     }
 
@@ -2056 +2053 @@
 }
 
-void UIMachineLogic::sltCloseSoftKeyboard(bool fAsync /* = false */)
-{
-    if (!m_pSoftKeyboardDialog)
-        return;
-    if (fAsync)
-        m_pSoftKeyboardDialog->deleteLater();
-    else
-        delete m_pSoftKeyboardDialog;
+void UIMachineLogic::sltCloseSoftKeyboard()
+{
+    delete m_pSoftKeyboardDialog;
     m_pSoftKeyboardDialog = 0;
 }

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

@@ -238 +238 @@
     void sltTakeSnapshot();
     void sltShowInformationDialog();
-    void sltCloseInformationDialog(bool fAsync = false);
-    void sltCloseInformationDialogDefault() { sltCloseInformationDialog(true); }
+    void sltCloseInformationDialog();
     void sltShowFileManagerDialog();
     void sltCloseFileManagerDialog();
@@ -263 +262 @@
     void sltShowKeyboardSettings();
     void sltShowSoftKeyboard();
-    void sltCloseSoftKeyboard(bool fAsync = false);
-    void sltCloseSoftKeyboardDefault() { sltCloseSoftKeyboard(true); }
+    void sltCloseSoftKeyboard();
     void sltTypeCAD();
 #ifdef VBOX_WS_NIX