Skip to content

Commit bb0551b

Browse files
committed
Android crash fix attempt
1 parent 3faf744 commit bb0551b

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

configuration.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3528,8 +3528,7 @@ static config_file_t *open_default_config_file(void)
35283528
goto error;
35293529

35303530
path_set(RARCH_PATH_CONFIG, conf_path);
3531-
if (path_is_empty(RARCH_PATH_CONFIG_DEFAULT))
3532-
path_set(RARCH_PATH_CONFIG_DEFAULT, conf_path);
3531+
path_set(RARCH_PATH_CONFIG_DEFAULT, conf_path);
35333532

35343533
return conf;
35353534

@@ -4011,7 +4010,10 @@ static bool config_load_file(global_t *global,
40114010
DEFAULT_MIDI_OUTPUT);
40124011

40134012
/* History playlists must stay in default config path */
4014-
path_config = path_get(RARCH_PATH_CONFIG_DEFAULT);
4013+
if (!path_is_empty(RARCH_PATH_CONFIG_DEFAULT))
4014+
path_config = path_get(RARCH_PATH_CONFIG_DEFAULT);
4015+
else
4016+
path_config = path_get(RARCH_PATH_CONFIG);
40154017

40164018
if (string_is_empty(settings->paths.path_content_favorites))
40174019
strlcpy(settings->paths.directory_content_favorites, "default",

0 commit comments

Comments
 (0)