Fixed issue where the explicit fossil path setting was not being applied

FossilOrigin-Name: c9ad2689d2d946996f03dbdd62016a33cb7ef4a4
This commit is contained in:
Kostas
2015-07-29 07:34:18 +00:00
parent d23e35edd7
commit 45db311f63
4 changed files with 14 additions and 9 deletions

View File

@@ -126,6 +126,8 @@ public:
const QString &getUIHttpPort() const { return fossilUIPort; }
QString getUIHttpAddress() const;
void setFossilPath(const QString &path) { fossilPath = path; }
private:
void log(const QString &text, bool isHTML=false)
{

View File

@@ -300,6 +300,8 @@ MainWindow::MainWindow(Settings &_settings, QWidget *parent, QString *workspaceP
applySettings();
fossil().setFossilPath(settings.GetValue(FUEL_SETTING_FOSSIL_PATH).toString());
// Apply any explicit workspace path if available
if(workspacePath && !workspacePath->isEmpty())
openWorkspace(*workspacePath);
@@ -1780,6 +1782,7 @@ void MainWindow::on_actionSettings_triggered()
if(!SettingsDialog::run(this, settings))
return;
fossil().setFossilPath(settings.GetValue(FUEL_SETTING_FOSSIL_PATH).toString());
updateCustomActions();
}