合并上游

shadowsocksRb · Apr 20, 2020 · 6ab191b · 6ab191b
2 parents 809a032 + 2f6319d
commit 6ab191b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -10,8 +10,8 @@ buildscript {
         compileSdkVersion = 29
         buildToolsVersion = '29.0.3'
         desugarLibsVersion = '1.0.5'
-        versionCode = 406
-        versionName = '5.0.5R.1'
+        versionCode = 407
+        versionName = '5.0.6R'
         resConfigs = ['zh-rCN']
     }
 

diff --git a/core/src/main/java/com/github/shadowsocks/bg/GuardedProcessPool.kt b/core/src/main/java/com/github/shadowsocks/bg/GuardedProcessPool.kt
@@ -94,7 +94,9 @@ class GuardedProcessPool(private val onFatal: suspend (IOException) -> Unit) : C
                         try {
                             Os.kill(pid.get(process) as Int, OsConstants.SIGTERM)
                         } catch (e: ErrnoException) {
-                            if (e.errno != OsConstants.ESRCH) throw e
+                            if (e.errno != OsConstants.ESRCH) Crashlytics.logException(e)
+                        } catch (e: ReflectiveOperationException) {
+                            Crashlytics.logException(e)
                         }
                         if (withTimeoutOrNull(500) { exitChannel.receive() } != null) return@withContext
                     }