mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-12 00:40:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6686 from bparker06/qt_defer_init

Browse Source 
Qt: only init new UI the first time it is about to be shown
This commit is contained in:
Twinaphex 2018-05-01 23:49:09 +02:00 committed by GitHub
commit b247962115
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,7 +95,9 @@ AppHandler::~AppHandler()
void AppHandler::exit() void AppHandler::exit()
{ {
app_exiting = true; app_exiting = true;
qApp->closeAllWindows();
if (qApp)
qApp->closeAllWindows();
} }
bool AppHandler::isExiting() const bool AppHandler::isExiting() const

12
ui/ui_companion_driver.c
View File

@ -131,7 +131,7 @@ void ui_companion_driver_init_first(void)
ui_companion = (ui_companion_driver_t*)ui_companion_init_first(); ui_companion = (ui_companion_driver_t*)ui_companion_init_first();
#ifdef HAVE_QT #ifdef HAVE_QT
if (settings->bools.desktop_menu_enable) if (settings->bools.desktop_menu_enable && settings->bools.ui_companion_toggle)
{ {
ui_companion_qt_data = ui_companion_qt.init(); ui_companion_qt_data = ui_companion_qt.init();
qt_is_inited = true; qt_is_inited = true;
@ -159,8 +159,16 @@ void ui_companion_driver_toggle(bool force)
#ifdef HAVE_QT #ifdef HAVE_QT
if (settings->bools.desktop_menu_enable) if (settings->bools.desktop_menu_enable)
if (ui_companion_qt.toggle) {
if ((settings->bools.ui_companion_toggle || force) && !qt_is_inited)
{
ui_companion_qt_data = ui_companion_qt.init();
qt_is_inited = true;
}
if (qt_is_inited && ui_companion_qt.toggle)
ui_companion_qt.toggle(ui_companion_qt_data, force); ui_companion_qt.toggle(ui_companion_qt_data, force);
}
#endif #endif
} }