Instead of Always Killing Wine Services, Boot Wine Prefix First and l…

…ater starts to kill (this fixes sometimes mountmgr not working on latest version)
KreitinnSoftware · Dec 29, 2024 · 7273f95 · 7273f95
1 parent 2bf25bb
commit 7273f95
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/app/src/main/java/com/micewine/emu/activities/MainActivity.kt b/app/src/main/java/com/micewine/emu/activities/MainActivity.kt
@@ -631,12 +631,13 @@ class MainActivity : AppCompatActivity() {
             runCommand("pkill -9 wineserver")
             runCommand("pkill -9 .exe")
             runCommand(getEnv() + "$usrDir/bin/pulseaudio --start --exit-idle=-1")
+            WineWrapper.wine("wineboot", winePrefix)
 
             var wineRunning = true
 
             lifecycleScope.launch {
                 while (!enableServices && wineRunning) {
-                    runCommand("pkill -9 services.exe")
+                    runCommand("pkill -9 services.exe", false)
                     delay(1200)
                 }
             }

diff --git a/app/src/main/java/com/micewine/emu/core/ShellLoader.kt b/app/src/main/java/com/micewine/emu/core/ShellLoader.kt
@@ -57,7 +57,11 @@ object ShellLoader {
     }
 
     fun runCommand(cmd: String) {
-        ShellLoader().runCommand(cmd)
+        ShellLoader().runCommand(cmd, true)
+    }
+
+    fun runCommand(cmd: String, log: Boolean) {
+        ShellLoader().runCommand(cmd, log)
     }
 
     private class ShellLoader {
@@ -100,8 +104,10 @@ object ShellLoader {
             }.start()
         }
 
-        fun runCommand(cmd: String) {
-            Log.v("ShellLoader", "Trying to exec: '$cmd'")
+        fun runCommand(cmd: String, log: Boolean) {
+            if (log) {
+                Log.v("ShellLoader", "Trying to exec: '$cmd'")
+            }
 
             os?.writeBytes("$cmd\nexit\n")
             os?.flush()