mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 15:45:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't show override notification with appendconfig alone (#14624)

Browse Source
This commit is contained in:
sonninnos 2022-11-14 21:52:05 +02:00 committed by GitHub
parent cd2392c559
commit 030c3cba44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
configuration.c
View File

@ -3899,6 +3899,7 @@ bool config_load_override(void *data)
char content_dir_name[PATH_MAX_LENGTH]; char content_dir_name[PATH_MAX_LENGTH];
char config_directory[PATH_MAX_LENGTH]; char config_directory[PATH_MAX_LENGTH];
bool should_append = false; bool should_append = false;
bool show_notification = true;
rarch_system_info_t *system = (rarch_system_info_t*)data; rarch_system_info_t *system = (rarch_system_info_t*)data;
const char *core_name = system ? const char *core_name = system ?
system->info.library_name : NULL; system->info.library_name : NULL;
@ -3951,7 +3952,10 @@ bool config_load_override(void *data)
/* Prevent "--appendconfig" from being ignored */ /* Prevent "--appendconfig" from being ignored */
if (!path_is_empty(RARCH_PATH_CONFIG_APPEND)) if (!path_is_empty(RARCH_PATH_CONFIG_APPEND))
should_append = true; {
should_append = true;
show_notification = false;
}
/* per-core overrides */ /* per-core overrides */
/* Create a new config file from core_path */ /* Create a new config file from core_path */
@ -3977,7 +3981,8 @@ bool config_load_override(void *data)
path_set(RARCH_PATH_CONFIG_APPEND, tmp_path); path_set(RARCH_PATH_CONFIG_APPEND, tmp_path);
should_append = true; should_append = true;
show_notification = true;
} }
if (has_content) if (has_content)
@ -4006,7 +4011,8 @@ bool config_load_override(void *data)
path_set(RARCH_PATH_CONFIG_APPEND, tmp_path); path_set(RARCH_PATH_CONFIG_APPEND, tmp_path);
should_append = true; should_append = true;
show_notification = true;
} }
/* per-game overrides */ /* per-game overrides */
@ -4033,7 +4039,8 @@ bool config_load_override(void *data)
path_set(RARCH_PATH_CONFIG_APPEND, tmp_path); path_set(RARCH_PATH_CONFIG_APPEND, tmp_path);
should_append = true; should_append = true;
show_notification = true;
} }
} }
@ -4045,13 +4052,14 @@ bool config_load_override(void *data)
/* Toggle has_save_path to false so it resets */ /* Toggle has_save_path to false so it resets */
retroarch_override_setting_unset(RARCH_OVERRIDE_SETTING_STATE_PATH, NULL); retroarch_override_setting_unset(RARCH_OVERRIDE_SETTING_STATE_PATH, NULL);
retroarch_override_setting_unset(RARCH_OVERRIDE_SETTING_SAVE_PATH, NULL); retroarch_override_setting_unset(RARCH_OVERRIDE_SETTING_SAVE_PATH, NULL);
if (!config_load_file(global_get_ptr(), if (!config_load_file(global_get_ptr(),
path_get(RARCH_PATH_CONFIG), settings)) path_get(RARCH_PATH_CONFIG), settings))
return false; return false;
if (settings->bools.notification_show_config_override_load) if (settings->bools.notification_show_config_override_load
&& show_notification)
runloop_msg_queue_push(msg_hash_to_str(MSG_CONFIG_OVERRIDE_LOADED), runloop_msg_queue_push(msg_hash_to_str(MSG_CONFIG_OVERRIDE_LOADED),
1, 100, false, 1, 100, false,
NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO); NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
@ -4079,7 +4087,7 @@ bool config_unload_override(void)
/* Toggle has_save_path to false so it resets */ /* Toggle has_save_path to false so it resets */
retroarch_override_setting_unset(RARCH_OVERRIDE_SETTING_STATE_PATH, NULL); retroarch_override_setting_unset(RARCH_OVERRIDE_SETTING_STATE_PATH, NULL);
retroarch_override_setting_unset(RARCH_OVERRIDE_SETTING_SAVE_PATH, NULL); retroarch_override_setting_unset(RARCH_OVERRIDE_SETTING_SAVE_PATH, NULL);
if (!config_load_file(global_get_ptr(), if (!config_load_file(global_get_ptr(),
path_get(RARCH_PATH_CONFIG), config_st)) path_get(RARCH_PATH_CONFIG), config_st))