Generic highlighter: Default to use fallback only if pre-installed definitions were found.

1 files changed, 8 insertions, 3 deletions

diff --git a/src/plugins/texteditor/generichighlighter/highlightersettings.cpp b/src/plugins/texteditor/generichighlighter/highlightersettings.cpp
index dd975c0793..758d8b1b94 100644
--- a/src/plugins/texteditor/generichighlighter/highlightersettings.cpp
+++ b/src/plugins/texteditor/generichighlighter/highlightersettings.cpp
@@ -139,12 +139,17 @@ void HighlighterSettings::fromSettings(const QString &category, QSettings *s)
                                 QLatin1String("/generic-highlighter");
     else
         m_definitionFilesPath = s->value(kDefinitionFilesPath).toString();
-    if (!s->contains(kFallbackDefinitionFilesPath))
+    if (!s->contains(kFallbackDefinitionFilesPath)) {
         m_fallbackDefinitionFilesPath = findDefinitionsLocation();
-    else
+        if (m_fallbackDefinitionFilesPath.isEmpty())
+            m_useFallbackLocation = false;
+        else
+            m_useFallbackLocation = true;
+    } else {
         m_fallbackDefinitionFilesPath = s->value(kFallbackDefinitionFilesPath).toString();
+        m_useFallbackLocation = s->value(kUseFallbackLocation, true).toBool();
+    }
     m_alertWhenNoDefinition = s->value(kAlertWhenDefinitionIsNotFound, true).toBool();
-    m_useFallbackLocation = s->value(kUseFallbackLocation, true).toBool();
     if (!s->contains(kIgnoredFilesPatterns))
         assignInitialIgnoredPatterns();
     else