summaryrefslogtreecommitdiff
path: root/src/plugins/perforce
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@digia.com>2014-08-19 16:15:57 +0200
committerEike Ziller <eike.ziller@digia.com>2014-08-22 08:54:34 +0200
commit6772ba622a8ae37161571143005d45db180b8275 (patch)
treefdead16fe54fd7c583e074f7ea2a0df6be26f6b7 /src/plugins/perforce
parent8213a88d3e6a3cb0952918095e5ee6543f8fd6a3 (diff)
downloadqt-creator-6772ba622a8ae37161571143005d45db180b8275.tar.gz
Fix closing editor with ctrl+w or "x" or File > Close
If there are other editors on the document visible in some split, it should not close the document, but only the editor. Task-number: QTCREATORBUG-9346 Change-Id: Idce1ae2f518d4c6e875d86f9831d41c46c06361c Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src/plugins/perforce')
-rw-r--r--src/plugins/perforce/perforceplugin.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp
index 582a20cfcd..d6ec7835da 100644
--- a/src/plugins/perforce/perforceplugin.cpp
+++ b/src/plugins/perforce/perforceplugin.cpp
@@ -1329,7 +1329,8 @@ void PerforcePlugin::describe(const QString & source, const QString &n)
void PerforcePlugin::submitCurrentLog()
{
m_submitActionTriggered = true;
- EditorManager::closeEditor(submitEditor());
+ QTC_ASSERT(submitEditor(), return);
+ EditorManager::closeDocument(submitEditor()->document());
}
void PerforcePlugin::cleanCommitMessageFile()