From 5c5be96f52401c85944d6e4a4b39059acd54f594 Mon Sep 17 00:00:00 2001 From: riccardom Date: Tue, 12 May 2009 19:39:23 +0000 Subject: [PATCH] Remember to load default config for keys and joypad so no need to mess ourself setting them if we don't find the group in the config file. --- desmume/src/gtk/desmume_config.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/desmume/src/gtk/desmume_config.cpp b/desmume/src/gtk/desmume_config.cpp index 5a87289ce..bb5406c0b 100644 --- a/desmume/src/gtk/desmume_config.cpp +++ b/desmume/src/gtk/desmume_config.cpp @@ -59,6 +59,7 @@ GKeyFile *desmume_config_read_file() g_free(config_file); + load_default_config(gtk_kb_cfg); desmume_config_read_keys(keyfile); desmume_config_read_joykeys(keyfile); @@ -113,13 +114,8 @@ gboolean desmume_config_read_keys(GKeyFile *keyfile) { GError *error = NULL; - if (!g_key_file_has_group(keyfile, "KEYS")) { - for (int i = 0; i < NB_KEYS; i++) { - keyboard_cfg[i] = gtk_kb_cfg[i]; - } - desmume_config_update_keys(keyfile); - return TRUE; - } + if (!g_key_file_has_group(keyfile, "KEYS")) + return TRUE; for (int i = 0; i < NB_KEYS; i++) { keyboard_cfg[i] = g_key_file_get_integer(keyfile, "KEYS", key_names[i], &error); @@ -136,8 +132,8 @@ gboolean desmume_config_read_joykeys(GKeyFile *keyfile) { GError *error = NULL; - if (!g_key_file_has_group(keyfile, "KEYS")) - return FALSE; + if (!g_key_file_has_group(keyfile, "JOYKEYS")) + return TRUE; for (int i = 0; i < NB_KEYS; i++) { joypad_cfg[i] = g_key_file_get_integer(keyfile, "JOYKEYS", key_names[i], &error);