From 7fe9bcdb07786e05108ea436944d604cdbb58eb7 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 24 May 2013 08:56:20 +0200 Subject: [PATCH] CppEditor: Don't try to set mimetype when opening failed Change-Id: Ie0823acc3dfd216c3f22a93ee39d9919bf95c0a9 Reviewed-by: Eike Ziller --- src/plugins/cppeditor/cppeditor.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp index 74238c2d6dd..b436aa27c8b 100644 --- a/src/plugins/cppeditor/cppeditor.cpp +++ b/src/plugins/cppeditor/cppeditor.cpp @@ -1876,10 +1876,11 @@ Core::Id CPPEditor::id() const bool CPPEditor::open(QString *errorString, const QString &fileName, const QString &realFileName) { - bool b = TextEditor::BaseTextEditor::open(errorString, fileName, realFileName); + if (!TextEditor::BaseTextEditor::open(errorString, fileName, realFileName)) + return false; editorWidget()->setMimeType( Core::ICore::mimeDatabase()->findByFile(QFileInfo(fileName)).type()); - return b; + return true; } const Utils::CommentDefinition *CPPEditor::commentDefinition() const