Merge branch 'master' into release

Swordfish90 · Apr 12, 2021 · 49c170c · 49c170c
2 parents e06b696 + abb6aa9
commit 49c170c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/lemuroid-app/build.gradle.kts b/lemuroid-app/build.gradle.kts
@@ -8,8 +8,8 @@ plugins {
 
 android {
     defaultConfig {
-        versionCode = 137
-        versionName = "1.10.0-beta"
+        versionCode = 141
+        versionName = "1.10.0"
         applicationId = "com.swordfish.lemuroid"
     }
 

diff --git a/lemuroid-app/src/main/java/com/swordfish/lemuroid/app/mobile/feature/game/GameService.kt b/lemuroid-app/src/main/java/com/swordfish/lemuroid/app/mobile/feature/game/GameService.kt
@@ -15,9 +15,12 @@ class GameService : Service() {
     }
 
     override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
-        val game = intent.extras?.getSerializable(EXTRA_GAME) as Game?
+        val game = kotlin.runCatching {
+            intent.extras?.getSerializable(EXTRA_GAME) as Game?
+        }.getOrNull()
+
         displayNotification(game)
-        return START_STICKY
+        return START_NOT_STICKY
     }
 
     private fun displayNotification(game: Game?) {