Integrating github/staging through commit ab87ed9

This commit is contained in:
alexpete
2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
+3 -1
View File
@@ -442,7 +442,8 @@ bool ShortcutDispatcher::shortcutFilter(QObject* obj, QShortcutEvent* shortcutEv
QWidget* correctedTopLevel = nullptr;
QWidget* p = currentFocusWidget;
while (correctedTopLevel = FindParentScopeRoot(p))
correctedTopLevel = FindParentScopeRoot(p);
while (correctedTopLevel)
{
if (FindCandidateActionAndFire(correctedTopLevel, shortcutEvent, candidates, previouslyVisited))
{
@@ -450,6 +451,7 @@ bool ShortcutDispatcher::shortcutFilter(QObject* obj, QShortcutEvent* shortcutEv
}
p = correctedTopLevel;
correctedTopLevel = FindParentScopeRoot(p);
}