diff options
author | Marcus Tillmanns <marcus.tillmanns@qt.io> | 2023-06-08 07:34:56 +0200 |
---|---|---|
committer | Marcus Tillmanns <marcus.tillmanns@qt.io> | 2023-06-08 06:24:33 +0000 |
commit | f83fb72af8c8c872b6a55f8d8d53db41d819ad7b (patch) | |
tree | cd9a5f1460e067f9a04ccaf1ea9e29c56c0244d6 /src/plugins/terminal/terminalwidget.cpp | |
parent | 4e000b87312fa35b6fd8f7262c09c58ecfc179ee (diff) |
Terminal: Fix assertv11.0.0-beta1
ShortCutMap::addShortCut did assert if the keysequence was empty.
Changed Q_ASSERT to QTC_ASSERT to not crash.
Change-Id: Ib03e21bb00ab989e00d5c3de68b52b84c6eb2360
Reviewed-by: David Schulz <david.schulz@qt.io>
Diffstat (limited to 'src/plugins/terminal/terminalwidget.cpp')
-rw-r--r-- | src/plugins/terminal/terminalwidget.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/plugins/terminal/terminalwidget.cpp b/src/plugins/terminal/terminalwidget.cpp index 91905c99d4..6753047369 100644 --- a/src/plugins/terminal/terminalwidget.cpp +++ b/src/plugins/terminal/terminalwidget.cpp @@ -262,10 +262,12 @@ void TerminalWidget::registerShortcut(Command *cmd) QTC_ASSERT(cmd, return); auto addShortCut = [this, cmd] { for (const auto &keySequence : cmd->keySequences()) { - m_shortcutMap.addShortcut(cmd->action(), - keySequence, - Qt::ShortcutContext::WindowShortcut, - contextMatcher); + if (!keySequence.isEmpty()) { + m_shortcutMap.addShortcut(cmd->action(), + keySequence, + Qt::ShortcutContext::WindowShortcut, + contextMatcher); + } } }; auto removeShortCut = [this, cmd] { m_shortcutMap.removeShortcut(0, cmd->action()); }; |