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

Git - use appropriate working directory in ChangeSelectionDialog

Browse Source 
In case Working Directory is changed in dialog, use new one for command.

Change-Id: Iea2e71d3695fff49a6375d19d723f4d62a092c2f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Petar Perisin
2013-05-06 18:09:51 +02:00
parent fe3f65da0f
commit 6e677a97fb
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/git/gitplugin.cpp
View File

@@ -776,20 +776,23 @@ void GitPlugin::startRebase()
void GitPlugin::startChangeRelatedAction()
{
const VcsBase::VcsBasePluginState state = currentState();
const QString workingDirectory = state.topLevel();
if (workingDirectory.isEmpty())
if (!state.hasTopLevel())
return;
QPointer<ChangeSelectionDialog> dialog = new ChangeSelectionDialog
(workingDirectory, Core::ICore::mainWindow());
(state.topLevel(), Core::ICore::mainWindow());
int result = dialog->exec();
if (dialog.isNull() || (result == QDialog::Rejected) || dialog->change().isEmpty())
if (dialog.isNull() || result == QDialog::Rejected)
return;
const QString workingDirectory = dialog->workingDirectory();
const QString change = dialog->change();
if (workingDirectory.isEmpty() || change.isEmpty())
return;
if (dialog->command() == Show) {
m_gitClient->show(workingDirectory, change);
return;