feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

WorkingDirectoryAspect: Do not reset directory when setting default

Browse Source 
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 <hjk@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2016-06-24 12:57:13 +02:00
parent 8e20454158
commit 21ef857c7a
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/projectexplorer/runconfigurationaspects.cpp
View File

@@ -244,13 +244,14 @@ void WorkingDirectoryAspect::setDefaultWorkingDirectory(const FileName &defaultW
Utils::FileName oldDefaultDir = m_defaultWorkingDirectory; Utils::FileName oldDefaultDir = m_defaultWorkingDirectory;
m_defaultWorkingDirectory = defaultWorkingDir; m_defaultWorkingDirectory = defaultWorkingDir;
if (m_chooser) { if (m_chooser)
if (m_chooser->fileName() == oldDefaultDir)
m_chooser->setFileName(m_defaultWorkingDirectory);
m_chooser->setBaseFileName(m_defaultWorkingDirectory); 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; m_workingDirectory = defaultWorkingDir;
}
} }
PathChooser *WorkingDirectoryAspect::pathChooser() const PathChooser *WorkingDirectoryAspect::pathChooser() const