Fossil::Init now requires a path to the fossil executable

FossilOrigin-Name: ee09b7f597c4ab4b81a24c281ab33893f3c20ed6
This commit is contained in:
Kostas
2015-08-27 12:00:28 +00:00
parent 2541fc79f8
commit 765aa9a6d8
5 changed files with 14 additions and 13 deletions

View File

@@ -17,11 +17,12 @@ Fossil::Fossil()
}
///////////////////////////////////////////////////////////////////////////////
void Fossil::Init(UICallback *callback)
void Fossil::Init(UICallback *callback, const QString &exePath)
{
uiCallback = callback;
fossilPath.clear();
workspacePath.clear();
setExePath(exePath);
}
//------------------------------------------------------------------------------

View File

@@ -21,7 +21,7 @@ public:
};
Fossil();
void Init(UICallback *callback);
void Init(UICallback *callback, const QString &exePath);
// Repositories
bool createRepository(const QString &repositoryPath);

View File

@@ -316,9 +316,9 @@ MainWindow::MainWindow(Settings &_settings, QWidget *parent, QString *workspaceP
viewMode = VIEWMODE_TREE;
uiCallback.init(this);
// Need to be before applySettings which sets the last workspace
getWorkspace().fossil().Init(&uiCallback);
getWorkspace().fossil().setExePath(settings.GetValue(FUEL_SETTING_FOSSIL_PATH).toString());
getWorkspace().fossil().Init(&uiCallback, settings.GetValue(FUEL_SETTING_FOSSIL_PATH).toString());
applySettings();