diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2019-10-15 14:08:02 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2019-10-16 08:16:23 +0000 |
| commit | e90a48e639af0c4a01f78a78ca3b33aef4f0a114 (patch) | |
| tree | 0cc8e8fb44ee1776bf1ed6b309833f595c9f1d90 /src/plugins/coreplugin/modemanager.cpp | |
| parent | 42fba8ee3bee257974058e2c41f38f6dd77c6e23 (diff) | |
ProjectExplorer: Fix some problems with plugin unloading
It was not possible to return false from
ProjectExplorerPlugin::initialize() without triggering crashes.
Change-Id: I96b2f80c835e69769f64f9b9c61f473e9ff88623
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/coreplugin/modemanager.cpp')
| -rw-r--r-- | src/plugins/coreplugin/modemanager.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/coreplugin/modemanager.cpp b/src/plugins/coreplugin/modemanager.cpp index be69338372..536c6e4714 100644 --- a/src/plugins/coreplugin/modemanager.cpp +++ b/src/plugins/coreplugin/modemanager.cpp @@ -238,6 +238,9 @@ void ModeManager::removeMode(IMode *mode) { const int index = d->m_modes.indexOf(mode); d->m_modes.remove(index); + if (d->m_startingUp) + return; + d->m_modeCommands.remove(index); d->m_modeStack->removeTab(index); |