From 8185324dddd63e726785466984df142ff8c5258b Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 29 Sep 2016 10:04:32 +0200 Subject: [PATCH] Add global conditional around this --- paths.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/paths.c b/paths.c index baacff9355..95a1bf2dc2 100644 --- a/paths.c +++ b/paths.c @@ -426,16 +426,19 @@ void path_set_names(const char *path) path_set_basename(path); - if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_SAVE_PATH)) - fill_pathname_noext(global->name.savefile, path_main_basename, - file_path_str(FILE_PATH_SRM_EXTENSION), sizeof(global->name.savefile)); + if (global) + { + if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_SAVE_PATH)) + fill_pathname_noext(global->name.savefile, path_main_basename, + file_path_str(FILE_PATH_SRM_EXTENSION), sizeof(global->name.savefile)); - if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_STATE_PATH)) - fill_pathname_noext(global->name.savestate, path_main_basename, - file_path_str(FILE_PATH_STATE_EXTENSION), sizeof(global->name.savestate)); + if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_STATE_PATH)) + fill_pathname_noext(global->name.savestate, path_main_basename, + file_path_str(FILE_PATH_STATE_EXTENSION), sizeof(global->name.savestate)); - fill_pathname_noext(global->name.cheatfile, path_main_basename, - file_path_str(FILE_PATH_CHT_EXTENSION), sizeof(global->name.cheatfile)); + fill_pathname_noext(global->name.cheatfile, path_main_basename, + file_path_str(FILE_PATH_CHT_EXTENSION), sizeof(global->name.cheatfile)); + } path_set_redirect(); }