Resync

Author: inactive123

include/queues/task_queue.h

@@ -191,6 +191,8 @@ char* task_get_title(retro_task_t *task);
 
 void* task_get_data(retro_task_t *task);
 
+bool task_is_on_main_thread(void);
+
 void task_queue_set_threaded(void);
 
 void task_queue_unset_threaded(void);

queues/task_queue.c

@@ -66,6 +66,7 @@ static struct retro_task_impl *impl_current = NULL;
 static bool task_threaded_enable            = false;
 
 #ifdef HAVE_THREADS
+static uintptr_t main_thread_id             = 0;
 static slock_t *running_lock                = NULL;
 static slock_t *finished_lock               = NULL;
 static slock_t *property_lock               = NULL;
@@ -614,6 +615,7 @@ void task_queue_init(bool threaded, retro_task_queue_msg_t msg_push)
    impl_current = &impl_regular;
 
 #ifdef HAVE_THREADS
+   main_thread_id = sthread_get_current_thread_id();
    if (threaded)
    {
       task_threaded_enable = true;
@@ -750,6 +752,15 @@ void task_queue_retriever_info_free(task_retriever_info_t *list)
    }
 }
 
+bool task_is_on_main_thread(void)
+{
+#ifdef HAVE_THREADS
+   return sthread_get_current_thread_id() == main_thread_id;
+#else
+   return true;
+#endif
+}
+
 void task_set_finished(retro_task_t *task, bool finished)
 {
    SLOCK_LOCK(property_lock);

streams/file_stream.c

@@ -241,7 +241,11 @@ int filestream_vscanf(RFILE *stream, const char* format, va_list *args)
     *   cause the va_list to have an indeterminate value
     *   in the function calling filestream_vscanf(),
     *   leading to unexpected behaviour */
+#ifdef __va_copy
+   __va_copy(args_copy, *args);
+#else
    va_copy(args_copy, *args);
+#endif
 
    while (*format)
    {