feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Resolve ambiguity of F10 shortcut

Browse Source 
The debugger plugin (correctly) starts in a C_DEBUGGER_NOTRUNNING
context, but this was not removed on engine selection, i.e. F10
stayed active for "Start and break on main" while the engine
activated F10 for "Next", too.

Fixes: QTCREATORBUG-22330
Change-Id: Ia0a477c8519dc0d5097e3f41a60a5a9e86124b69
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2019-04-23 12:42:00 +02:00
parent e570c9f6c4
commit 331c3d7782
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/debugger/enginemanager.cpp
View File

@@ -166,7 +166,13 @@ public:
Core::Id m_previousMode; Core::Id m_previousMode;
QPointer<QComboBox> m_engineChooser; QPointer<QComboBox> m_engineChooser;
bool m_shuttingDown = false; bool m_shuttingDown = false;
Context m_currentAdditionalContext;
// This contains the contexts that need to be removed when switching
// away from the current engine item. Since the plugin itself adds
// C_DEBUGGER_NOTRUNNING on initialization this is set here as well,
// so it can be removed when switching away from the initial (null)
// engine. See QTCREATORBUG-22330.
Context m_currentAdditionalContext{Constants::C_DEBUGGER_NOTRUNNING};
}; };
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////