From 336fa3b7754137e34d14552a05147b9393e11f03 Mon Sep 17 00:00:00 2001 From: Max Lv Date: Mon, 31 Aug 2015 13:05:45 +0800 Subject: [PATCH] fix a UI bug --- project/plugins.sbt | 2 +- src/main/scala/com/github/shadowsocks/Shadowsocks.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 0b283529..7acefdf6 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ resolvers += Resolver.url("scalasbt releases", new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-snapshots"))(Resolver.ivyStylePatterns) -addSbtPlugin("com.hanhuy.sbt" % "android-sdk-plugin" % "1.4.8") +addSbtPlugin("com.hanhuy.sbt" % "android-sdk-plugin" % "1.4.12") resolvers += "Sonatype snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/" diff --git a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala index 8b514577..646b2b08 100644 --- a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala +++ b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala @@ -1111,7 +1111,7 @@ class Shadowsocks changeSwitch(checked = true) setPreferenceEnabled(enabled = false) case State.STOPPED => - if (progressTag == R.string.stopping) { + if (progressTag == R.string.stopping || progressTag == R.string.connecting) { clearDialog() } changeSwitch(checked = false)