From 8386c06e07ce08a346aaef41c558953ed4494bd5 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 6 Jan 2020 14:48:41 +0100
Subject: [PATCH] Fix issue #9368 on Linux - 'Show desktop menu on startup'
 does not launch qt-ui

---
 retroarch.c              | 21 +++++++++++++++++++++
 ui/ui_companion_driver.h |  1 -
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/retroarch.c b/retroarch.c
index 20dcc909c5..798036952a 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -655,6 +655,7 @@ static input_device_driver_t *joypad_drivers[] = {
    &udev_joypad,
 #endif
 #if defined(__linux) && !defined(ANDROID)
+   &ui_companion_null,
    &linuxraw_joypad,
 #endif
 #ifdef HAVE_PARPORT
@@ -723,6 +724,25 @@ static const location_driver_t *location_drivers[] = {
    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[] = {
 #if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__)
    &ui_companion_win32,
@@ -733,6 +753,7 @@ static const ui_companion_driver_t *ui_companion_drivers[] = {
 #ifdef HAVE_COCOATOUCH
    &ui_companion_cocoatouch,
 #endif
+   &ui_companion_null,
    NULL
 };
 
diff --git a/ui/ui_companion_driver.h b/ui/ui_companion_driver.h
index d462d304b5..f00e9263a7 100644
--- a/ui/ui_companion_driver.h
+++ b/ui/ui_companion_driver.h
@@ -159,7 +159,6 @@ extern ui_application_t      ui_application_cocoa;
 extern ui_application_t      ui_application_qt;
 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_cocoatouch;
 extern ui_companion_driver_t ui_companion_qt;