Mercurial Repositories > eric / file diff

--- a/Preferences/__init__.py	Sat Mar 12 15:44:24 2016 +0100
+++ b/Preferences/__init__.py	Sun Mar 13 13:09:03 2016 +0100
@@ -911,9 +911,9 @@
         "FlashCookiesDataPath": flashDataPathForOS(),
     }
     if QWebSettings:
-        helpDefaults["HelpViewerType"] = 1,      # eric browser
+        helpDefaults["HelpViewerType"] = 1      # eric browser
     else:
-        helpDefaults["HelpViewerType"] = 2,      # Qt Assistant
+        helpDefaults["HelpViewerType"] = 2      # Qt Assistant
     
     @classmethod
     def initWebSettingsDefaults(cls):
@@ -2437,10 +2437,11 @@
         return pwConvert(prefClass.settings.value(
             "Help/" + key, prefClass.helpDefaults[key]), encode=False)
     elif key == "HelpViewerType":
-        # special treatment to adjust for missing QtWebKit
+        # special treatment to adjust for missing QtWebKit if eric web browser
+        # was selected
         value = int(prefClass.settings.value(
             "Help/" + key, prefClass.helpDefaults[key]))
-        if QWebSettings is None:
+        if value == 1 and QWebSettings is None:
             value = prefClass.helpDefaults[key]
         return value
     elif key in ["DiskCacheSize", "AcceptCookies",