Changeset 85907 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Aug 27, 2020 2:38:18 PM (5 years ago)

Author:

vboxsync

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

140092

Message:

FE/Qt: bugref:9609: UIActionPool: Do not initialize standard shortcuts for temporary action-pool, sequence will be revoked from already assigned permanent pool in such case provoking strange Qt crash.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• UIActionPool.cpp (modified) (1 diff)
• UIActionPoolManager.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp

@@ -1368 +1368 @@
     virtual QKeySequence standardShortcut(UIActionPoolType) const /* override */
     {
-        return QKeySequence(QKeySequence::Refresh);
+        return actionPool()->isTemporary() ? QKeySequence() : QKeySequence(QKeySequence::Refresh);
     }
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolManager.cpp

@@ -2531 +2531 @@
     virtual QKeySequence standardShortcut(UIActionPoolType) const /* override */
     {
-        return QKeySequence(QKeySequence::Find);
+        return actionPool()->isTemporary() ? QKeySequence() : QKeySequence(QKeySequence::Find);
     }
 
@@ -2578 +2578 @@
     virtual QKeySequence standardShortcut(UIActionPoolType) const /* override */
     {
-        return QKeySequence(QKeySequence::Refresh);
+        return actionPool()->isTemporary() ? QKeySequence() : QKeySequence(QKeySequence::Refresh);
     }
 
@@ -2777 +2777 @@
     virtual QKeySequence standardShortcut(UIActionPoolType) const /* override */
     {
-        return QKeySequence(QKeySequence::Refresh);
+        return actionPool()->isTemporary() ? QKeySequence() : QKeySequence(QKeySequence::Refresh);
     }
 
@@ -3063 +3063 @@
     virtual QKeySequence standardShortcut(UIActionPoolType) const /* override */
     {
-        return QKeySequence(QKeySequence::HelpContents);
+        return actionPool()->isTemporary() ? QKeySequence() : QKeySequence(QKeySequence::HelpContents);
     }