diff --git a/src/plugins/coreplugin/modemanager.cpp b/src/plugins/coreplugin/modemanager.cpp index 84fdc98bcd9d0dd07d85ccaaafb6d9c4e7e8a97a..ff0ce2c15715a8598cd83f517712526552869f68 100644 --- a/src/plugins/coreplugin/modemanager.cpp +++ b/src/plugins/coreplugin/modemanager.cpp @@ -218,6 +218,18 @@ void ModeManager::enabledStateChanged() int index = d->m_modes.indexOf(mode); QTC_ASSERT(index >= 0, return); d->m_modeStack->setTabEnabled(index, mode->isEnabled()); + + // Make sure we leave any disabled mode to prevent possible crashes: + if (mode == currentMode() && !mode->isEnabled()) { + // This assumes that there is always at least one enabled mode. + for (int i = 0; i < d->m_modes.count(); ++i) { + if (d->m_modes.at(i) != mode && + d->m_modes.at(i)->isEnabled()) { + activateMode(d->m_modes.at(i)->id()); + break; + } + } + } } void ModeManager::aboutToRemoveObject(QObject *obj)