ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

logic: retry pre-filling mandatory empty path settings on startup (#864)

Browse Source
This commit is contained in:
Malte Langkabel
2019-12-29 23:03:37 +01:00
committed by GitHub
parent 2ab4e2bab9
commit 270c8698dc
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/settings/ApplicationSettingsPrefiller.cpp
+5 -5
View File
@@ -23,7 +23,7 @@ void ApplicationSettingsPrefiller::prefillPaths(ApplicationSettings* settings)
bool ApplicationSettingsPrefiller::prefillJavaRuntimePath(ApplicationSettings* settings) bool ApplicationSettingsPrefiller::prefillJavaRuntimePath(ApplicationSettings* settings)
{ {
if (settings->getHasPrefilledJavaPath()) if (settings->getHasPrefilledJavaPath() && !settings->getJavaPath().empty())
{ {
return false; return false;
} }
@@ -49,7 +49,7 @@ bool ApplicationSettingsPrefiller::prefillJavaRuntimePath(ApplicationSettings* s
bool ApplicationSettingsPrefiller::prefillJreSystemLibraryPaths(ApplicationSettings* settings) bool ApplicationSettingsPrefiller::prefillJreSystemLibraryPaths(ApplicationSettings* settings)
{ {
if (settings->getHasPrefilledJreSystemLibraryPaths()) if (settings->getHasPrefilledJreSystemLibraryPaths()) // allow empty
{ {
return false; return false;
} }
@@ -76,7 +76,7 @@ bool ApplicationSettingsPrefiller::prefillJreSystemLibraryPaths(ApplicationSetti
bool ApplicationSettingsPrefiller::prefillMavenExecutablePath(ApplicationSettings* settings) bool ApplicationSettingsPrefiller::prefillMavenExecutablePath(ApplicationSettings* settings)
{ {
if (settings->getHasPrefilledMavenPath()) if (settings->getHasPrefilledMavenPath() && !settings->getMavenPath().empty())
{ {
return false; return false;
} }
@@ -102,7 +102,7 @@ bool ApplicationSettingsPrefiller::prefillMavenExecutablePath(ApplicationSetting
bool ApplicationSettingsPrefiller::prefillCxxHeaderPaths(ApplicationSettings* settings) bool ApplicationSettingsPrefiller::prefillCxxHeaderPaths(ApplicationSettings* settings)
{ {
if (settings->getHasPrefilledHeaderSearchPaths()) if (settings->getHasPrefilledHeaderSearchPaths()) // allow empty
{ {
return false; return false;
} }
@@ -126,7 +126,7 @@ bool ApplicationSettingsPrefiller::prefillCxxHeaderPaths(ApplicationSettings* se
bool ApplicationSettingsPrefiller::prefillCxxFrameworkPaths(ApplicationSettings* settings) bool ApplicationSettingsPrefiller::prefillCxxFrameworkPaths(ApplicationSettings* settings)
{ {
if (settings->getHasPrefilledFrameworkSearchPaths()) if (settings->getHasPrefilledFrameworkSearchPaths()) // allow empty
{ {
return false; return false;
} }