From bbb62be458fa41b41bbd4d06e06f5a1da08a2bc6 Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Mon, 28 Sep 2015 21:05:41 +0800
Subject: [PATCH] fix a race condition

---
 src/main/scala/com/github/shadowsocks/Shadowsocks.scala | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
index 434d7ee1..ac650de5 100644
--- a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
+++ b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
@@ -250,7 +250,7 @@ class Shadowsocks
 
   private lazy val application = getApplication.asInstanceOf[ShadowsocksApplication]
 
-  var handler: Handler = null
+  var handler = new Handler()
 
   def isSinglePane: Boolean = {
     if (singlePane == -1) {
@@ -479,8 +479,6 @@ class Shadowsocks
 
     super.onCreate(savedInstanceState)
 
-    handler = new Handler()
-
     addPreferencesFromResource(R.xml.pref_all)
 
     // Update the profile
@@ -901,10 +899,7 @@ class Shadowsocks
     deattachService()
     unregisterReceiver(preferenceReceiver)
     new BackupManager(this).dataChanged()
-    if (handler != null) {
-      handler.removeCallbacksAndMessages(null)
-      handler = null
-    }
+    handler.removeCallbacksAndMessages(null)
   }
 
   def copyToSystem() {