ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't override g_extern.verbose CLI argument.

This commit is contained in:
Themaister 2014-05-26 11:07:59 +02:00
parent ef09cf5aff
commit 4093933abb
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
general.h
View File

@ -379,6 +379,7 @@ struct global
bool has_set_libretro_device[MAX_PLAYERS];
bool has_set_libretro;
bool has_set_libretro_directory;
bool has_set_verbosity;
#ifdef HAVE_RMENU
char menu_texture_path[PATH_MAX];

2
retroarch.c
View File

@ -892,6 +892,7 @@ static void parse_input(int argc, char *argv[])
g_extern.has_set_state_path = false;
g_extern.has_set_libretro = false;
g_extern.has_set_libretro_directory = false;
g_extern.has_set_verbosity = false;
*g_extern.subsystem = '\0';
if (argc < 2)
@ -1042,6 +1043,7 @@ static void parse_input(int argc, char *argv[])
case 'v':
g_extern.verbose = true;
g_extern.has_set_verbosity = true;
break;
case 'N':

4
settings.c
View File

@ -1023,7 +1023,9 @@ bool config_load_file(const char *path, bool set_defaults)
CONFIG_GET_BOOL(rgui_show_start_screen, "rgui_show_start_screen");
#endif
CONFIG_GET_INT(libretro_log_level, "libretro_log_level");
CONFIG_GET_BOOL_EXTERN(verbose, "log_verbosity");
if (!g_extern.has_set_verbosity)
CONFIG_GET_BOOL_EXTERN(verbose, "log_verbosity");
#ifdef HAVE_OVERLAY
CONFIG_GET_PATH_EXTERN(overlay_dir, "overlay_directory");