From 21ef857c7abf1a93c44dd42885658941aa9a5e33 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Fri, 24 Jun 2016 12:57:13 +0200 Subject: [PATCH] WorkingDirectoryAspect: Do not reset directory when setting default Do not reset the working directory when setting the default working directory. That update was triggered by setting the PathChooser filename. Task-number: QTCREATORBUG-16330 Change-Id: I5db846c8cf2a6cadad812e775a8424645b15c7c5 Reviewed-by: hjk --- .../projectexplorer/runconfigurationaspects.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/plugins/projectexplorer/runconfigurationaspects.cpp b/src/plugins/projectexplorer/runconfigurationaspects.cpp index 1479bd18cc1..5492b2fa2b2 100644 --- a/src/plugins/projectexplorer/runconfigurationaspects.cpp +++ b/src/plugins/projectexplorer/runconfigurationaspects.cpp @@ -244,13 +244,14 @@ void WorkingDirectoryAspect::setDefaultWorkingDirectory(const FileName &defaultW Utils::FileName oldDefaultDir = m_defaultWorkingDirectory; m_defaultWorkingDirectory = defaultWorkingDir; - if (m_chooser) { - if (m_chooser->fileName() == oldDefaultDir) - m_chooser->setFileName(m_defaultWorkingDirectory); + if (m_chooser) m_chooser->setBaseFileName(m_defaultWorkingDirectory); - } - if (m_workingDirectory.isEmpty() || m_workingDirectory == oldDefaultDir) + + if (m_workingDirectory.isEmpty() || m_workingDirectory == oldDefaultDir) { + if (m_chooser) + m_chooser->setFileName(m_defaultWorkingDirectory); m_workingDirectory = defaultWorkingDir; + } } PathChooser *WorkingDirectoryAspect::pathChooser() const