AnotherFoxGuy/fuel-scm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed incorrect remote search key

Browse Source 
FossilOrigin-Name: 1f10dd85e5d7e95539baaea140623673b19f12f2
This commit is contained in:
kostas
2015-05-29 19:11:10 +00:00
parent 422bbafdf6
commit 8c020c7502
4 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/MainWindow.cpp
View File

@@ -2604,7 +2604,6 @@ void MainWindow::on_actionAddRemote_triggered()
}
url.setPassword("");
url.setUserName("");
getWorkspace().addRemote(url, name);
updateWorkspaceView();

12
src/Workspace.cpp
View File

@@ -102,8 +102,14 @@ bool Workspace::switchWorkspace(const QString& workspace, QSettings &store)
QUrl default_remote;
if(fossil().getRemoteUrl(default_remote) && default_remote.isValid() && !default_remote.isEmpty())
{
addRemote(default_remote, default_remote.toDisplayString());
setRemoteDefault(default_remote);
default_remote.setPassword("");
// Add Default remote if not available already
if(findRemote(default_remote)==NULL)
{
addRemote(default_remote, default_remote.toDisplayString());
setRemoteDefault(default_remote);
}
}
return true;
@@ -311,7 +317,7 @@ bool Workspace::addRemote(const QUrl& url, const QString& name)
Q_ASSERT(url.password().isEmpty());
Remote r(name, url);
remotes.insert(r.name, r);
remotes.insert(url, r);
return true;
}