diff options
| author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2017-07-17 15:50:59 +0200 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2017-08-10 10:04:58 +0000 |
| commit | f4f240ad431b234c97c3f0c50e81484ec305a652 (patch) | |
| tree | 20dbbfe1f9824556883aa03d572ff92691ed982d | |
| parent | f4f79a352c8b67b150e54726d5e40868bcf7afdb (diff) | |
| download | qt-creator-f4f240ad431b234c97c3f0c50e81484ec305a652.tar.gz | |
Debugger: Switch perspective when coming from another mode
Problematic case was:
1. Run some analyzer (mode switch: edit->debug)
2. Close project, re-open it (mode switch: debug->edit)
3. Run analyzer from 1. again
--> Ops, no mode switch to debug mode (and thus no analyzer view)
because it's still the same perspective
Task-number: QTCREATORBUG-18549
Change-Id: Iccb1e0629454c1373280a55d6c41410c7161520e
Reviewed-by: hjk <hjk@qt.io>
| -rw-r--r-- | src/plugins/debugger/debuggerplugin.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 3af98ae879..a56b48582f 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -3561,8 +3561,10 @@ void setPerspectiveEnabled(const QByteArray &perspectiveId, bool enabled) void selectPerspective(const QByteArray &perspectiveId) { - if (dd->m_mainWindow->currentPerspective() == perspectiveId) + if (ModeManager::currentMode() == MODE_DEBUG + && dd->m_mainWindow->currentPerspective() == perspectiveId) { return; + } // FIXME: Work-around aslong as the GammaRay integration does not use the same setup, if (perspectiveId.isEmpty()) |