Merge pull request #535 from wyzegob/master

Change the state after all the checks and initialization
2016-01-13 13:14:51 +08:00
parent 3facb73cf1 7f937a8ee6
commit e9406080e2
1 changed files with 2 additions and 3 deletions
@@ -393,13 +393,10 @@ class ShadowsocksNatService extends BaseService {
  }

  override def startRunner(config: Config) {
-
-    changeState(State.CONNECTING)
    if (!Console.isRoot) {
      changeState(State.STOPPED, getString(R.string.nat_no_root))
      return
    }
-
    super.startRunner(config)

    // register close receiver
@@ -413,6 +410,8 @@ class ShadowsocksNatService extends BaseService {
    registerReceiver(closeReceiver, filter)

    ShadowsocksApplication.track(TAG, "start")
+    
+    changeState(State.CONNECTING)

    ThrowableFuture {
      if (config.proxy == "198.199.101.152") {