From aaece725aa0430c50cdebb44e1f87118ecf6ee38 Mon Sep 17 00:00:00 2001
From: petosorus <petosorus@hotmail.fr>
Date: Thu, 9 Feb 2017 23:26:31 +0100
Subject: [PATCH] Saving price system preference

---
 gui/builtinPreferenceViews/pyfaGeneralPreferences.py | 9 ++++-----
 service/fit.py                                       | 3 ++-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gui/builtinPreferenceViews/pyfaGeneralPreferences.py b/gui/builtinPreferenceViews/pyfaGeneralPreferences.py
index e48277439..d75c3002f 100644
--- a/gui/builtinPreferenceViews/pyfaGeneralPreferences.py
+++ b/gui/builtinPreferenceViews/pyfaGeneralPreferences.py
@@ -84,7 +84,7 @@ class PFGeneralPref ( PreferenceView):
         self.cbMarketShortcuts.SetValue(self.sFit.serviceFittingOptions["showMarketShortcuts"] or False)
         self.cbGaugeAnimation.SetValue(self.sFit.serviceFittingOptions["enableGaugeAnimation"])
         self.cbExportCharges.SetValue(self.sFit.serviceFittingOptions["exportCharges"])
-        self.chPriceSystem.SetStringSelection("Jita")
+        self.chPriceSystem.SetStringSelection(self.sFit.serviceFittingOptions["priceSystem"])
 
         self.cbGlobalChar.Bind(wx.EVT_CHECKBOX, self.OnCBGlobalCharStateChange)
         self.cbGlobalDmgPattern.Bind(wx.EVT_CHECKBOX, self.OnCBGlobalDmgPatternStateChange)
@@ -168,11 +168,10 @@ class PFGeneralPref ( PreferenceView):
         return BitmapLoader.getBitmap("prefs_settings", "gui")
 
     def onPriceSelection(self, event):
-        Price.currentSystemId = Price.systemsList.get(
-            self.chPriceSystem.GetString(self.chPriceSystem.GetSelection())
-        )
+        system = self.chPriceSystem.GetString(self.chPriceSystem.GetSelection())
+        Price.currentSystemId = Price.systemsList.get(system)
+        self.sFit.serviceFittingOptions["priceSystem"] = system
 
-        mainFrame = gui.mainFrame.MainFrame.getInstance()
         sFit = service.Fit.getInstance()
         fitID = self.mainFrame.getActiveFit()
         fit = sFit.getFit(fitID)
diff --git a/service/fit.py b/service/fit.py
index 2d3b75be5..0a4867359 100644
--- a/service/fit.py
+++ b/service/fit.py
@@ -106,7 +106,8 @@ class Fit(object):
             "showTooltip": True,
             "showMarketShortcuts": False,
             "enableGaugeAnimation": True,
-            "exportCharges": True}
+            "exportCharges": True,
+            "priceSystem": "Jita"}
 
         self.serviceFittingOptions = SettingsProvider.getInstance().getSettings(
             "pyfaServiceFittingOptions", serviceFittingDefaultOptions)