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

(Qt) Process events is already called in runloop_iterate - we 

will take it out of Qt application run function and rely on
runloop_iterate's 'runloop_check_state' leaf function to call
Qt's event processing instead
This commit is contained in:
twinaphex 2019-07-11 01:02:00 +02:00
parent d06ce4df13
commit 1bfd4b8ae2
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
retroarch.c
View File

@ -19360,6 +19360,14 @@ static enum runloop_state runloop_check_state(
/* Should be called once per frame */ /* Should be called once per frame */
if (!appletMainLoop()) if (!appletMainLoop())
return RUNLOOP_STATE_QUIT; return RUNLOOP_STATE_QUIT;
#else
if (!video_driver_is_threaded_internal())
{
const ui_application_t *application = ui_companion
? ui_companion->application : NULL;
if (application)
application->process_events();
}
#endif #endif
BIT256_CLEAR_ALL_PTR(&current_bits); BIT256_CLEAR_ALL_PTR(&current_bits);
@ -19400,13 +19408,6 @@ static enum runloop_state runloop_check_state(
} }
} }
if (!video_driver_is_threaded_internal())
{
const ui_application_t *application = ui_companion
? ui_companion->application : NULL;
if (application)
application->process_events();
}
#ifdef HAVE_MENU #ifdef HAVE_MENU
if (menu_driver_binding_state) if (menu_driver_binding_state)

8
ui/drivers/qt/ui_qt_application.cpp
View File

@ -154,14 +154,10 @@ static void ui_application_qt_quit(void)
static void ui_application_qt_run(void *args) static void ui_application_qt_run(void *args)
{ {
#ifdef HAVE_MAIN #ifdef HAVE_MAIN
int ret;
unsigned sleep_ms = 0;
do do
{ {
ui_application_qt_process_events(); unsigned sleep_ms = 0;
int ret = runloop_iterate(&sleep_ms);
ret = runloop_iterate(&sleep_ms);
if (ret == 1 && sleep_ms > 0) if (ret == 1 && sleep_ms > 0)
retro_sleep(sleep_ms); retro_sleep(sleep_ms);