Merge branch 'development' into feature/commandmenu

2017-03-26 14:43:12 -04:00
parent df587892a3 c3a0176c88
commit a67c28a4c9
13 changed files with 115 additions and 42 deletions
--- a/service/fit.py
+++ b/service/fit.py
@@ -73,6 +73,7 @@ class Fit(object):
            "exportCharges": True,
            "openFitInNew": False,
            "priceSystem": "Jita",
+            "showShipBrowserTooltip": True,
        }

        self.serviceFittingOptions = SettingsProvider.getInstance().getSettings(
--- a/service/settings.py
+++ b/service/settings.py
@@ -74,8 +74,6 @@ class SettingsProvider(object):
                            info[item] = defaults[item]

            self.settings[area] = s = Settings(p, info)
-        else:
-            s = None

        return s