From 3067ce62853cd99fd16a009bcaecb9839029fc46 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 4 Jul 2019 17:21:58 +0200 Subject: [PATCH] Small cleanup --- configuration.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/configuration.c b/configuration.c index a03c2bc15e..68913cbe16 100644 --- a/configuration.c +++ b/configuration.c @@ -1174,7 +1174,6 @@ static struct config_array_setting *populate_settings_array(settings_t *settings static struct config_path_setting *populate_settings_path(settings_t *settings, int *size) { unsigned count = 0; - global_t *global = global_get_ptr(); struct config_path_setting *tmp = (struct config_path_setting*)calloc(1, (*size + 1) * sizeof(struct config_path_setting)); if (!tmp) @@ -1302,12 +1301,15 @@ static struct config_path_setting *populate_settings_path(settings_t *settings, "screenshot_directory", settings->paths.directory_screenshot, true, NULL, false); - if (global) { - SETTING_PATH("recording_output_directory", - global->record.output_dir, false, NULL, true); - SETTING_PATH("recording_config_directory", - global->record.config_dir, false, NULL, true); + global_t *global = global_get_ptr(); + if (global) + { + SETTING_PATH("recording_output_directory", + global->record.output_dir, false, NULL, true); + SETTING_PATH("recording_config_directory", + global->record.config_dir, false, NULL, true); + } } SETTING_ARRAY("log_dir", settings->paths.log_dir, true, NULL, true);