From 6080962cf9274acd8436f3400f959b8a3472ce97 Mon Sep 17 00:00:00 2001
From: Marco Allegretti <mightymarco4@gmail.com>
Date: Fri, 13 Feb 2026 13:40:33 +0100
Subject: [PATCH] lutris: avoid lingering process on import timeout

---
 src/lutrisimporter.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/lutrisimporter.cpp b/src/lutrisimporter.cpp
index 5961c87..e09ff95 100644
--- a/src/lutrisimporter.cpp
+++ b/src/lutrisimporter.cpp
@@ -98,7 +98,7 @@ QList<Game *> LutrisImporter::importGames()
         QProcess process;
         process.start(lutrisPath, {QStringLiteral("-lo"), QStringLiteral("--json")});
 
-        if (process.waitForFinished(30000)) {
+        if (process.waitForStarted(5000) && process.waitForFinished(30000)) {
             QByteArray output = process.readAllStandardOutput();
             QJsonDocument doc = QJsonDocument::fromJson(output);
 
@@ -139,6 +139,14 @@ QList<Game *> LutrisImporter::importGames()
                     Q_EMIT importProgress(current, total);
                 }
             }
+        } else {
+            if (process.state() != QProcess::NotRunning) {
+                process.terminate();
+                if (!process.waitForFinished(3000)) {
+                    process.kill();
+                    process.waitForFinished(3000);
+                }
+            }
         }
     }