From 3111703828251da66563f16c1965291d1642a30f Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Wed, 18 May 2011 11:38:35 +0200 Subject: Don't open files and help if someone chooses to cancel loading an example. Task-Number: QTCREATORBUG-4414 Change-Id: I0272091d185fe6a9ac23022eb4efb723eb541494x (cherry picked from commit 15ac4f0e21c63826a70650e68c433898306307d1) Reviewed-on: http://codereview.qt.nokia.com/148 Reviewed-by: hjk --- .../qt4projectmanager/gettingstartedwelcomepagewidget.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp index f6f9a86717..d2c9c0e80b 100644 --- a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp +++ b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp @@ -422,7 +422,6 @@ void GettingStartedWelcomePageWidget::slotOpenExample() } QString tryFile; - files << proFile; if (isQmlProject) { tryFile = proFileInfo.path() + '/' + "/main.qml"; if(!QFile::exists(tryFile)) @@ -436,10 +435,13 @@ void GettingStartedWelcomePageWidget::slotOpenExample() tryFile = proFileInfo.path() + "/main.cpp"; if(!QFile::exists(tryFile)) tryFile = proFileInfo.path() + '/' + proFileInfo.baseName() + ".cpp"; + files << tryFile; + } + if (ProjectExplorer::ProjectExplorerPlugin::instance()->openProject(proFile)) { + Core::ICore::instance()->openFiles(files); + if (!helpFile.isEmpty()) + slotOpenContextHelpPage(helpFile); } - Core::ICore::instance()->openFiles(files, static_cast(Core::ICore::SwitchMode | Core::ICore::StopOnLoadFail)); - if (!tryFile.isEmpty() && Core::EditorManager::instance()->hasEditor(tryFile) && !helpFile.isEmpty()) - slotOpenContextHelpPage(helpFile); } void GettingStartedWelcomePageWidget::slotOpenHelpPage(const QString& url) -- cgit v1.2.1