Merge pull request #4645 from fr500/master

Fix #4644
This commit is contained in:
Twinaphex 2017-02-15 11:49:45 +01:00 committed by GitHub
commit f84b6e9020

View File

@ -50,12 +50,14 @@
* will write to this file. */
static FILE *log_file = NULL;
static bool main_verbosity = false;
static bool initialized = false;
void verbosity_enable(void)
{
main_verbosity = true;
#ifdef RARCH_INTERNAL
frontend_driver_attach_console();
if (!log_file)
frontend_driver_attach_console();
#endif
}
@ -63,7 +65,8 @@ void verbosity_disable(void)
{
main_verbosity = false;
#ifdef RARCH_INTERNAL
frontend_driver_detach_console();
if (!log_file)
frontend_driver_detach_console();
#endif
}
@ -84,11 +87,14 @@ void *retro_main_log_file(void)
void retro_main_log_file_init(const char *path)
{
if (initialized)
return;
log_file = stderr;
if (path == NULL)
return;
log_file = fopen(path, "wb");
initialized = true;
}
void retro_main_log_file_deinit(void)
@ -102,7 +108,7 @@ void retro_main_log_file_deinit(void)
void RARCH_LOG_V(const char *tag, const char *fmt, va_list ap)
{
#if TARGET_OS_IPHONE
static int asl_inited = 0;
static int asl_initialized = 0;
#if !TARGET_IPHONE_SIMULATOR
static aslclient asl_client;
#endif
@ -117,10 +123,10 @@ static aslclient asl_client;
#if TARGET_IPHONE_SIMULATOR
vprintf(fmt, ap);
#else
if (!asl_inited)
if (!asl_initialized)
{
asl_client = asl_open(file_path_str(FILE_PATH_PROGRAM_NAME), "com.apple.console", ASL_OPT_STDERR | ASL_OPT_NO_DELAY);
asl_inited = 1;
asl_initialized = 1;
}
aslmsg msg = asl_new(ASL_TYPE_MSG);
asl_set(msg, ASL_KEY_READ_UID, "-1");