IO/PKG: Fix hanging on shell exit by forcing a timeout

d4rken-org · Jan 22, 2025 · 090d4db · 090d4db
1 parent 46104ff
commit 090d4db
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/app-common-shell/src/main/java/eu/darken/sdmse/common/shell/SharedShell.kt b/app-common-shell/src/main/java/eu/darken/sdmse/common/shell/SharedShell.kt
@@ -15,6 +15,7 @@ import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.plus
 import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withTimeoutOrNull
 
 class SharedShell(
     tag: String,
@@ -38,7 +39,7 @@ class SharedShell(
             log(aTag) { "Closing!" }
             runBlocking {
                 try {
-                    session.close()
+                    withTimeoutOrNull(5 * 1000) { session.close() } ?: session.cancel()
                     val exitCode = session.waitFor()
                     log(aTag) { "FlowCmdShell finished with exitcode $exitCode" }
                 } catch (e: CancellationException) {