summaryrefslogtreecommitdiffstats
path: root/gtk
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2015-05-14 18:04:16 +0000
committerjstebbins <[email protected]>2015-05-14 18:04:16 +0000
commit970688a142998ddf68cf1950436bb92e0385139c (patch)
tree5720b2b1c6cfe924bc8fbcd3978e3f4df078d43f /gtk
parent9ae7e30dc8daace92d17ea36a4f0bdede00b9471 (diff)
LinGui: rename json preferences file ...
... so it doesn't overwrite old format plist file. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7180 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'gtk')
-rw-r--r--gtk/src/presets.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/gtk/src/presets.c b/gtk/src/presets.c
index 7f9c5f8c9..5bd032fca 100644
--- a/gtk/src/presets.c
+++ b/gtk/src/presets.c
@@ -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;
}