Changeset 88873 in vbox for trunk/src/VBox/Frontends

Timestamp:

May 5, 2021 9:13:45 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10006. Dont set close button shortcut while dialog is closing.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QIManagerDialog.h (modified) (1 diff)
• guestctrl/UIFileManagerDialog.cpp (modified) (1 diff)
• logviewer/UIVMLogViewerDialog.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIManagerDialog.h

@@ -154 +154 @@
         virtual void closeEvent(QCloseEvent *pEvent) /* override */;
     /** @} */
+        /** Returns the value of m_fCloseEmitted. */
+        bool closeEmitted() const { return m_fCloseEmitted; }
 
 private slots:

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

@@ -144 +144 @@
 void UIFileManagerDialog::sltSetCloseButtonShortCut(QKeySequence shortcut)
 {
-    if (button(ButtonType_Close))
+    if (!closeEmitted() &&  button(ButtonType_Close))
         button(ButtonType_Close)->setShortcut(shortcut);
 }

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerDialog.cpp

@@ -159 +159 @@
 void UIVMLogViewerDialog::sltSetCloseButtonShortCut(QKeySequence shortcut)
 {
-    if (button(ButtonType_Close))
+    if (!closeEmitted() &&  button(ButtonType_Close))
         button(ButtonType_Close)->setShortcut(shortcut);
 }