Fix su detection

2016-08-17 12:29:17 +08:00
parent eee89774df
commit 958d387b8c
1 changed files with 5 additions and 3 deletions
@@ -305,9 +305,11 @@ class ShadowsocksNatService extends BaseService {
  override def startRunner(profile: Profile) = if (su == null) {
    su = new Shell.Builder().useSU().setWantSTDERR(true).setWatchdogTimeout(10).open((_, exitCode, _) =>
      if (exitCode == 0) super.startRunner(profile) else {
-        Log.wtf(TAG, "libsuperuser#55 has been fixed. Please remove the redundant code.")
-        su.close()
-        su = null
+        if (su != null) {
+          Log.wtf(TAG, "libsuperuser#55 has been fixed. Please remove the redundant code.")
+          su.close()
+          su = null
+        }
        super.stopRunner(true, getString(R.string.nat_no_root))
      })
    su.waitForIdle()