Fix issue #9368 on Linux - 'Show desktop menu on startup' does not

launch qt-ui
This commit is contained in:
twinaphex 2020-01-06 14:48:41 +01:00
parent 85d11eac30
commit 8386c06e07
2 changed files with 21 additions and 1 deletions

View File

@ -655,6 +655,7 @@ static input_device_driver_t *joypad_drivers[] = {
&udev_joypad, &udev_joypad,
#endif #endif
#if defined(__linux) && !defined(ANDROID) #if defined(__linux) && !defined(ANDROID)
&ui_companion_null,
&linuxraw_joypad, &linuxraw_joypad,
#endif #endif
#ifdef HAVE_PARPORT #ifdef HAVE_PARPORT
@ -723,6 +724,25 @@ static const location_driver_t *location_drivers[] = {
NULL, NULL,
}; };
static ui_companion_driver_t ui_companion_null = {
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
"null",
};
static const ui_companion_driver_t *ui_companion_drivers[] = { static const ui_companion_driver_t *ui_companion_drivers[] = {
#if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__) #if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__)
&ui_companion_win32, &ui_companion_win32,
@ -733,6 +753,7 @@ static const ui_companion_driver_t *ui_companion_drivers[] = {
#ifdef HAVE_COCOATOUCH #ifdef HAVE_COCOATOUCH
&ui_companion_cocoatouch, &ui_companion_cocoatouch,
#endif #endif
&ui_companion_null,
NULL NULL
}; };

View File

@ -159,7 +159,6 @@ extern ui_application_t ui_application_cocoa;
extern ui_application_t ui_application_qt; extern ui_application_t ui_application_qt;
extern ui_application_t ui_application_win32; extern ui_application_t ui_application_win32;
extern ui_companion_driver_t ui_companion_null;
extern ui_companion_driver_t ui_companion_cocoa; extern ui_companion_driver_t ui_companion_cocoa;
extern ui_companion_driver_t ui_companion_cocoatouch; extern ui_companion_driver_t ui_companion_cocoatouch;
extern ui_companion_driver_t ui_companion_qt; extern ui_companion_driver_t ui_companion_qt;