Fix keyboard listener & Delay relaunch

Author: DRSchlaubi

client/build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
     alias(libs.plugins.buildconfig)
 }
 
-version = "1.5.0"
+version = "1.6.0"
 
 repositories {
     mavenCentral()

client/src/main/kotlin/Launcher.kt

@@ -13,30 +13,50 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
 import dev.schlaubi.mastermind.core.Updater
+import dev.schlaubi.mastermind.core.registerKeyboardHandler
 import dev.schlaubi.mastermind.core.settings.settings
 import dev.schlaubi.mastermind.core.settings.writeSettings
 import dev.schlaubi.mastermind.resources.Res
 import dev.schlaubi.mastermind.resources.icon
 import dev.schlaubi.mastermind.theme.AppTheme
 import dev.schlaubi.mastermind.ui.GTAKiller
+import dev.schlaubi.mastermind.util.Loom
 import dev.schlaubi.mastermind.windows_helper.GTAVersion
+import dev.schlaubi.mastermind.windows_helper.WindowsAPI
 import io.github.oshai.kotlinlogging.KotlinLogging
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import org.jetbrains.compose.resources.painterResource
+import java.lang.foreign.Arena
 
 private val LOG = KotlinLogging.logger { }
 
 fun main() = application {
     Updater()
     LaunchedEffect(Unit) {
-        val detectedVersion = GTAVersion.systemDefault()
-        LOG.info { "Detected GTA version: $detectedVersion" }
-
-        if (detectedVersion != null) {
-            writeSettings(settings.copy(gtaVersion = detectedVersion))
-        }
     }
     Window(title = "GTA Killer", icon = painterResource(Res.drawable.icon), onCloseRequest = ::exitApplication) {
         var loading by remember { mutableStateOf(true) }
+        val scope = rememberCoroutineScope()
+
+        DisposableEffect(Unit) {
+            val arena = Arena.ofShared()
+            scope.launch(Dispatchers.Loom) {
+                WindowsAPI.registerKeyboardHook()
+                registerKeyboardHandler(arena)
+
+                val detectedVersion = GTAVersion.systemDefault()
+                LOG.info { "Detected GTA version: $detectedVersion" }
+
+                if (detectedVersion != null) {
+                    writeSettings(settings.copy(gtaVersion = detectedVersion))
+                }
+
+                loading = false
+            }
+
+            onDispose { arena.close() }
+        }
         if (loading) {
             AppTheme {
                 Scaffold {

client/src/main/kotlin/core/KeyBoardListener.kt

@@ -1,32 +1,19 @@
 package dev.schlaubi.mastermind.core
 
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.SideEffect
 import dev.schlaubi.mastermind.core.settings.settings
 import dev.schlaubi.mastermind.util.Loom
 import dev.schlaubi.mastermind.windows_helper.WindowsAPI
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
 import java.lang.foreign.Arena
 
-@Composable
-fun KeyBoardListener() {
-    SideEffect { WindowsAPI.registerKeyboardHook() }
-    DisposableEffect(Unit) {
-        val arena = Arena.ofConfined()
-
-        WindowsAPI.registerKeyboardListener(arena) { keyCode ->
-            if (keyCode == settings.hotkey) {
-                runBlocking(Dispatchers.Loom) {
-                    reportAndKill()
-                }
+fun registerKeyboardHandler(arena: Arena) {
+    WindowsAPI.registerKeyboardListener(arena) { keyCode ->
+        if (keyCode == settings.hotkey) {
+            runBlocking(Dispatchers.Loom) {
+                reportAndKill()
             }
         }
-
-        onDispose {
-            arena.close()
-        }
     }
 }
 

client/src/main/kotlin/core/ProcessHandler.kt

@@ -4,11 +4,13 @@ import dev.schlaubi.mastermind.core.settings.settings
 import dev.schlaubi.mastermind.windows_helper.WindowsAPI
 import io.github.oshai.kotlinlogging.KotlinLogging
 import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import kotlin.io.path.absolutePathString
 import kotlin.io.path.div
 import kotlin.jvm.optionals.getOrNull
+import kotlin.time.Duration.Companion.seconds
 
 private val LOG = KotlinLogging.logger { }
 
@@ -25,6 +27,8 @@ suspend fun killGta() {
     if (gtaProcess.isPresent) {
         gtaProcess.get().destroyForcibly()
 
+        delay(2.seconds)
+
         if (settings.autostartGta) {
             LOG.info { "Restarting GTA5.exe" }
             val gtaPath = WindowsAPI.readGtaLocation(version) / version.startBinary