From 270c8698dcd4e7b33327d41d89a538316bd430a6 Mon Sep 17 00:00:00 2001 From: Malte Langkabel Date: Sun, 29 Dec 2019 23:03:37 +0100 Subject: [PATCH] logic: retry pre-filling mandatory empty path settings on startup (#864) --- src/lib/settings/ApplicationSettingsPrefiller.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/settings/ApplicationSettingsPrefiller.cpp b/src/lib/settings/ApplicationSettingsPrefiller.cpp index ebafa036..b235d540 100644 --- a/src/lib/settings/ApplicationSettingsPrefiller.cpp +++ b/src/lib/settings/ApplicationSettingsPrefiller.cpp @@ -23,7 +23,7 @@ void ApplicationSettingsPrefiller::prefillPaths(ApplicationSettings* settings) bool ApplicationSettingsPrefiller::prefillJavaRuntimePath(ApplicationSettings* settings) { - if (settings->getHasPrefilledJavaPath()) + if (settings->getHasPrefilledJavaPath() && !settings->getJavaPath().empty()) { return false; } @@ -49,7 +49,7 @@ bool ApplicationSettingsPrefiller::prefillJavaRuntimePath(ApplicationSettings* s bool ApplicationSettingsPrefiller::prefillJreSystemLibraryPaths(ApplicationSettings* settings) { - if (settings->getHasPrefilledJreSystemLibraryPaths()) + if (settings->getHasPrefilledJreSystemLibraryPaths()) // allow empty { return false; } @@ -76,7 +76,7 @@ bool ApplicationSettingsPrefiller::prefillJreSystemLibraryPaths(ApplicationSetti bool ApplicationSettingsPrefiller::prefillMavenExecutablePath(ApplicationSettings* settings) { - if (settings->getHasPrefilledMavenPath()) + if (settings->getHasPrefilledMavenPath() && !settings->getMavenPath().empty()) { return false; } @@ -102,7 +102,7 @@ bool ApplicationSettingsPrefiller::prefillMavenExecutablePath(ApplicationSetting bool ApplicationSettingsPrefiller::prefillCxxHeaderPaths(ApplicationSettings* settings) { - if (settings->getHasPrefilledHeaderSearchPaths()) + if (settings->getHasPrefilledHeaderSearchPaths()) // allow empty { return false; } @@ -126,7 +126,7 @@ bool ApplicationSettingsPrefiller::prefillCxxHeaderPaths(ApplicationSettings* se bool ApplicationSettingsPrefiller::prefillCxxFrameworkPaths(ApplicationSettings* settings) { - if (settings->getHasPrefilledFrameworkSearchPaths()) + if (settings->getHasPrefilledFrameworkSearchPaths()) // allow empty { return false; }