Merge pull request #17812 from viachaslavic/fix_qt_dispatcher

LibretroAdmin · web-flow · commit 94149644f954 · 2025-04-16T07:24:16.000-07:00
Fix qt6 dispatcher
diff --git a/qb/config.libs.sh b/qb/config.libs.sh
@@ -313,6 +313,7 @@ if [ "$HAVE_QT" != 'no' ]; then
       then
          HAVE_QT6='yes'
          add_define MAKEFILE HAVE_QT6 1
+         add_define CONFIG HAVE_QT6 1
       fi
    fi
    if [ "$HAVE_QT6" != 'yes' ]; then
diff --git a/ui/ui_companion_driver.c b/ui/ui_companion_driver.c
@@ -140,7 +140,11 @@ void ui_companion_driver_init_first(
 {
    uico_driver_state_t *uico_st        = &uico_driver_st;
 #ifdef HAVE_QT
+#ifdef HAVE_QT6  /* FIXME: deferred initialization after loading/unloading content */
+   if (desktop_menu_enable)
+#else
    if (desktop_menu_enable && ui_companion_toggle)
+#endif
    {
       uico_st->qt_data                 = ui_companion_qt.init();
       uico_st->flags                  |= UICO_ST_FLAG_QT_IS_INITED;

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,11 @@ void ui_companion_driver_init_first(`
`140`	`140`	`{`
`141`	`141`	`uico_driver_state_t *uico_st = &uico_driver_st;`
`142`	`142`	`#ifdef HAVE_QT`
	`143`	`+#ifdef HAVE_QT6 /* FIXME: deferred initialization after loading/unloading content */`
	`144`	`+ if (desktop_menu_enable)`
	`145`	`+#else`
`143`	`146`	`if (desktop_menu_enable && ui_companion_toggle)`
	`147`	`+#endif`
`144`	`148`	`{`
`145`	`149`	`uico_st->qt_data = ui_companion_qt.init();`
`146`	`150`	`uico_st->flags \|= UICO_ST_FLAG_QT_IS_INITED;`