From 7fddb47dbce26436ab8b85ca2163dd245f89b780 Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Mon, 17 Feb 2020 17:26:00 -0500
Subject: [PATCH] Fix regression in e698879 that prevented detection of shift
 key on launch.

---
 oscar/main.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/oscar/main.cpp b/oscar/main.cpp
index f5254ddf..b416fcec 100644
--- a/oscar/main.cpp
+++ b/oscar/main.cpp
@@ -255,6 +255,17 @@ int main(int argc, char* argv[])
 
 #else
 
+bool shiftKeyPressedAtLaunch(int argc, char *argv[])
+{
+    // Reliably detecting the shift key requires a QGuiApplication instance, but
+    // we need to create the real QApplication afterwards, so create a temporary
+    // instance here.
+    QGuiApplication* app = new QGuiApplication(argc, argv);
+    Qt::KeyboardModifiers keymodifier = QGuiApplication::queryKeyboardModifiers();
+    delete app;
+    return keymodifier == Qt::ShiftModifier;
+}
+
 int main(int argc, char *argv[]) {
 
     QString homeDocs = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation)+"/";
@@ -265,9 +276,8 @@ int main(int argc, char *argv[]) {
     QSettings settings;
 
     // If shift key was held down when OSCAR was launched, force Software graphics Engine (aka LegacyGFX)
-    Qt::KeyboardModifiers keymodifier = QApplication::keyboardModifiers();
     QString forcedEngine = "";
-    if (keymodifier == Qt::ShiftModifier){
+    if (shiftKeyPressedAtLaunch(argc, argv)){
         settings.setValue(GFXEngineSetting, (unsigned int)GFX_Software);
         forcedEngine = "Software Engine forced by shift key at launch";
     }