Merge branch 'master' into release

Swordfish90 · May 29, 2021 · 3ff418d · 3ff418d
2 parents 70bd2a1 + e712504
commit 3ff418d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/lemuroid-app/build.gradle.kts b/lemuroid-app/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 android {
     defaultConfig {
-        versionCode = 147
+        versionCode = 148
         versionName = "1.11.1"
         applicationId = "com.swordfish.lemuroid"
     }

diff --git a/lemuroid-app/src/main/java/com/swordfish/lemuroid/app/mobile/feature/game/GameActivity.kt b/lemuroid-app/src/main/java/com/swordfish/lemuroid/app/mobile/feature/game/GameActivity.kt
@@ -103,7 +103,7 @@ class GameActivity : BaseGameActivity() {
 
         tiltSensor = TiltSensor(applicationContext)
 
-        serviceController = GameService.startService(applicationContext, game)
+        startGameService()
 
         setupVirtualGamePadVisibility()
         setupVirtualGamePads()
@@ -286,11 +286,24 @@ class GameActivity : BaseGameActivity() {
     }
 
     override fun onDestroy() {
-        serviceController = GameService.stopService(applicationContext, serviceController)
+        stopGameService()
         virtualControllerDisposables.clear()
         super.onDestroy()
     }
 
+    private fun startGameService() {
+        serviceController = GameService.startService(applicationContext, game)
+    }
+
+    private fun stopGameService() {
+        serviceController = GameService.stopService(applicationContext, serviceController)
+    }
+
+    override fun onFinishTriggered() {
+        super.onFinishTriggered()
+        stopGameService()
+    }
+
     private fun getGamePadTheme(context: Context): RadialGamePadTheme {
         val accentColor = GraphicsUtils.colorToRgb(context.getColor(R.color.colorPrimary))
         val alpha = (255 * PRESSED_COLOR_ALPHA).roundToInt()

diff --git a/lemuroid-app/src/main/java/com/swordfish/lemuroid/app/shared/game/BaseGameActivity.kt b/lemuroid-app/src/main/java/com/swordfish/lemuroid/app/shared/game/BaseGameActivity.kt
@@ -681,6 +681,7 @@ abstract class BaseGameActivity : ImmersiveActivity() {
     }
 
     private fun finishAndExitProcess() {
+        onFinishTriggered()
         GlobalScope.launch {
             sleep(animationDuration().toLong())
             exitProcess(0)
@@ -689,6 +690,8 @@ abstract class BaseGameActivity : ImmersiveActivity() {
         overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out)
     }
 
+    open fun onFinishTriggered() { }
+
     private fun cancelBackgroundWork() {
         SaveSyncWork.cancelAutoWork(applicationContext)
         SaveSyncWork.cancelManualWork(applicationContext)