diff --git a/scripts/globals/globals.gml b/scripts/globals/globals.gml index 5688ee65c..c9d1652d0 100644 --- a/scripts/globals/globals.gml +++ b/scripts/globals/globals.gml @@ -36,10 +36,10 @@ globalvar VERSION, SAVE_VERSION, VERSION_STRING, BUILD_NUMBER, LATEST_VERSION; LATEST_VERSION = 11700; - VERSION = 11761; + VERSION = 11770; SAVE_VERSION = 11700; - VERSION_STRING = "1.17.7.007"; - BUILD_NUMBER = 11761; + VERSION_STRING = "1.17.7"; + BUILD_NUMBER = 11770; globalvar HOTKEYS, HOTKEY_CONTEXT; HOTKEYS = ds_map_create(); diff --git a/scripts/preferences/preferences.gml b/scripts/preferences/preferences.gml index d162da050..be80eca4f 100644 --- a/scripts/preferences/preferences.gml +++ b/scripts/preferences/preferences.gml @@ -267,7 +267,8 @@ var path = DIRECTORY + "keys.json"; if(file_exists(path)) { var map = json_load_struct(path); - struct_override(PREFERENCES, map); + if(struct_has(map, "preferences")) struct_override(PREFERENCES, map.preferences); + else struct_override(PREFERENCES, map); } var path = DIRECTORY + "hotkeys.json";