From b399ca7fab5e33f11588e61825a66d646bb00113 Mon Sep 17 00:00:00 2001
From: the-sane <3657071+the-sane@users.noreply.github.com>
Date: Sun, 22 Jan 2023 11:21:28 -0500
Subject: [PATCH] lutris -v doesn't work if it's running

---
 lug-helper.sh | 50 +++++++++++++++++++++++++++-----------------------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/lug-helper.sh b/lug-helper.sh
index 06f65f7..ec708c8 100755
--- a/lug-helper.sh
+++ b/lug-helper.sh
@@ -813,33 +813,37 @@ lutris_detect() {
 lutris_check() {
     lutris_detect
 
-    if [ "$lutris_installed" = "true" ]; then
-        # Check the native lutris version number
-        if [ "$lutris_native" = "true" ]; then
-            lutris_current="$(lutris -v)"
-            if [ "$lutris_required" != "$lutris_current" ] &&
-               [ "$lutris_current" = "$(printf "$lutris_current\n$lutris_required" | sort -V | head -n1)" ]; then
-                preflight_fail+=("Lutris is out of date.\nVersion $lutris_required or newer is required.")
-            else
-                preflight_pass+=("Lutris is installed and up to date.")
-            fi
-        fi
-
-        # Check the flatpak lutris version number
-        if [ "$lutris_flatpak" = "true" ]; then
-            lutris_current="$(flatpak run net.lutris.Lutris -v)"
-            if [ "$lutris_required" != "$lutris_current" ] &&
-               [ "$lutris_current" = "$(printf "$lutris_current\n$lutris_required" | sort -V | head -n1)" ]; then
-                preflight_fail+=("Flatpak Lutris is out of date.\nVersion $lutris_required or newer is required.")
-            else
-                preflight_pass+=("Flatpak Lutris is installed and up to date.")
-            fi
-        fi
-    else
+    if [ "$lutris_installed" = "false" ]; then
         preflight_fail+=("Lutris does not appear to be installed.\nFor manual installations, this may be ignored.")
+        return 1
     fi
 
+    if [ "$(pgrep -f lutris)" ]; then
+        preflight_fail+=("Unable to detect Lutris version info while it is running.\nVersion $lutris_required or newer is required.")
+        return 1
+    fi
 
+    # Check the native lutris version number
+    if [ "$lutris_native" = "true" ]; then
+        lutris_current="$(lutris -v)"
+        if [ "$lutris_required" != "$lutris_current" ] &&
+            [ "$lutris_current" = "$(printf "$lutris_current\n$lutris_required" | sort -V | head -n1)" ]; then
+            preflight_fail+=("Lutris is out of date.\nVersion $lutris_required or newer is required.")
+        else
+            preflight_pass+=("Lutris is installed and up to date.")
+        fi
+    fi
+
+    # Check the flatpak lutris version number
+    if [ "$lutris_flatpak" = "true" ]; then
+        lutris_current="$(flatpak run net.lutris.Lutris -v)"
+        if [ "$lutris_required" != "$lutris_current" ] &&
+            [ "$lutris_current" = "$(printf "$lutris_current\n$lutris_required" | sort -V | head -n1)" ]; then
+            preflight_fail+=("Flatpak Lutris is out of date.\nVersion $lutris_required or newer is required.")
+        else
+            preflight_pass+=("Flatpak Lutris is installed and up to date.")
+        fi
+    fi
 }
 
 # Check the installed winetricks version