forked from qt-creator/qt-creator
Merge branch '0.9.2-rc1' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.2-rc1
This commit is contained in:
@@ -462,6 +462,7 @@ bool EditorManager::unregisterEditor(IEditor *editor)
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
void EditorManager::updateCurrentEditorAndGroup(IContext *context)
|
||||
{
|
||||
if (debugEditorManager)
|
||||
@@ -470,7 +471,8 @@ void EditorManager::updateCurrentEditorAndGroup(IContext *context)
|
||||
IEditor *editor = context ? qobject_cast<IEditor*>(context) : 0;
|
||||
if (groupContext) {
|
||||
m_d->m_splitter->setCurrentGroup(groupContext->editorGroup());
|
||||
setCurrentEditor(0);
|
||||
if (groupContext->editorGroup()->editorCount() == 0)
|
||||
setCurrentEditor(0);
|
||||
updateActions();
|
||||
} else if (editor) {
|
||||
setCurrentEditor(editor);
|
||||
|
||||
Reference in New Issue
Block a user