]> granicus.if.org Git - handbrake/commitdiff
LinGui: rename json preferences file ...
authorjstebbins <jstebbins.hb@gmail.com>
Thu, 14 May 2015 18:04:16 +0000 (18:04 +0000)
committerjstebbins <jstebbins.hb@gmail.com>
Thu, 14 May 2015 18:04:16 +0000 (18:04 +0000)
... so it doesn't overwrite old format plist file.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7180 b64f7644-9d1e-0410-96f1-a4d463321fa5

gtk/src/presets.c

index 7f9c5f8c9f70dcded4adc2e205f1eaac424c11d3..5bd032fca582febd4cd79646f0cfe62e94800fc8 100644 (file)
@@ -951,7 +951,9 @@ ghb_prefs_load(signal_user_data_t *ud)
     GhbValue *internalDict;
 
     internalDict = ghb_resource_get("internal-defaults");
-    prefsDict    = read_config_file("preferences");
+    prefsDict    = read_config_file("preferences.json");
+    if (prefsDict == NULL)
+        prefsDict    = read_config_file("preferences");
     if (prefsDict == NULL)
         prefsDict = ghb_dict_new();
     dict     = ghb_dict_get(prefsDict, "Preferences");
@@ -1475,7 +1477,7 @@ static guint prefs_timeout_id = 0;
 static gboolean
 delayed_store_prefs(gpointer data)
 {
-    write_config_file("preferences", prefsDict);
+    write_config_file("preferences.json", prefsDict);
     prefs_timeout_id = 0;
     return FALSE;
 }