From d9686f5b7830b5da68f7cc39895b3522b107bbcc Mon Sep 17 00:00:00 2001
From: mae <qtc-committer@nokia.com>
Date: Tue, 2 Dec 2008 15:39:53 +0100
Subject: [PATCH] Do not call QProcess::startDetached() with an empty string if
no external editor is defined.
---
src/plugins/coreplugin/editormanager/editormanager.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index 7b2e0b23627..8fd8ef14225 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -1152,7 +1152,7 @@ void EditorManager::updateActions()
m_d->m_duplicateAction->setEnabled(curEditor != 0 && curEditor->duplicateSupported());
- m_d->m_openInExternalEditorAction->setEnabled(curEditor != 0);
+ m_d->m_openInExternalEditorAction->setEnabled(curEditor != 0 && !m_d->m_externalEditor.isEmpty());
}
QList<IEditor*> EditorManager::openedEditors() const
@@ -1488,6 +1488,9 @@ QString EditorManager::externalEditorHelpText() const
void EditorManager::openInExternalEditor()
{
+ if (m_d->m_externalEditor.isEmpty())
+ return;
+
IEditor *editor = currentEditor();
if (!editor)
return;
@@ -1499,7 +1502,6 @@ void EditorManager::openInExternalEditor()
return;
}
-
QRect rect = editor->widget()->rect();
QFont font = editor->widget()->font();
QFontMetrics fm(font);
--
GitLab