load and export settings fixed

Author: sergiye

GUI/MainForm.cs

@@ -681,12 +681,17 @@ private void ExportSettingsMenu_Click(object sender, EventArgs e) {
         DefaultExt = ".config",
         FileName = "OpenHardwareMonitor.config",
         Filter = "Config files|*.config",
-        RestoreDirectory = true,
-        Title = "Export Settings As"
+        RestoreDirectory = false,
+        Title = "Export Settings As",
+        InitialDirectory = Path.GetDirectoryName(Application.ExecutablePath),
       };
       if (dlg.ShowDialog() != DialogResult.OK)
         return;
+      var oldPortableValue = settings.GetValue("portable", false);
+      settings.SetValue("portable", true);
       settings.SaveToFile(dlg.FileName);
+      if (!oldPortableValue)
+        settings.SetValue("portable", oldPortableValue);
       MessageBox.Show("Settings export completed successfully!", "Export Settings", MessageBoxButtons.OK, MessageBoxIcon.Information);
     }
   }

Utilities/PersistentSettings.cs

@@ -25,8 +25,11 @@ public void Load() {
       if (File.Exists(configFilePath)) {
         try {
           var json = File.ReadAllText(configFilePath);
-          settings = json.FromJson<IDictionary<string, string>>();
-          return;
+          var data = json.FromJson<IDictionary<string, string>>();
+          if (data != null) {
+            settings = data;
+            return;
+          }
         }
         catch (Exception) {
         }