Merge branch 'master' of github.com:buggins/dlangide

This commit is contained in:
Vadim Lopatin 2016-02-02 10:44:38 +03:00
commit a94fbd7ad1
2 changed files with 4 additions and 1 deletions

View File

@ -277,6 +277,7 @@ class Workspace : WorkspaceItem {
Log.e("empty workspace name");
return false;
}
auto originalStartupProjectName = _settings.startupProjectName;
Setting projects = _workspaceFile.objectByPath("projects", true);
foreach(string key, Setting value; projects) {
string path = value.str;
@ -287,6 +288,7 @@ class Workspace : WorkspaceItem {
_projects ~= project;
project.load();
}
_settings.startupProjectName = originalStartupProjectName;
fillStartupProject();
return true;
}

View File

@ -22,8 +22,9 @@ class WorkspaceSettings : SettingsFile {
return _startupProjectName;
}
@property void startupProjectName(string s) {
if (s.equal(_startupProjectName)) {
if (!s.equal(_startupProjectName)) {
_startupProjectName = s;
_setting["startupProject"] = s;
save();
}
}