Commit debe1808 authored by mae's avatar mae
Browse files

Fix restoring of editor state when loading a file

With the recent restructering of editor manager, the editor state
was restored while the editor was hidden, causing the editor to
ensure the visibility of the cursor when it is shown.
parent 49fb8870
......@@ -1146,10 +1146,12 @@ IEditor *EditorManager::openEditor(Core::Internal::EditorView *view, const QStri
return 0;
}
addEditor(editor);
restoreEditorState(editor);
QApplication::restoreOverrideCursor();
return activateEditor(view, editor, flags);
IEditor *result= activateEditor(view, editor, flags);
if (editor == result)
restoreEditorState(editor);
QApplication::restoreOverrideCursor();
return result;
}
bool EditorManager::openExternalEditor(const QString &fileName, const QString &editorKind)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment