From 7370b6a0b8cd4315f62296baac4443bdb0bec99c Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Thu, 13 Oct 2016 08:45:10 +0800
Subject: [PATCH] Fix #937

---
 .../scala/com/github/shadowsocks/ShadowsocksApplication.scala   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksApplication.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksApplication.scala
index 2abbc546..c13914f3 100644
--- a/src/main/scala/com/github/shadowsocks/ShadowsocksApplication.scala
+++ b/src/main/scala/com/github/shadowsocks/ShadowsocksApplication.scala
@@ -146,7 +146,7 @@ class ShadowsocksApplication extends Application {
     }
   } else {
     val newLocale = checkChineseLocale(config.locale)
-    if (config.locale != newLocale) {
+    if (newLocale != null && config.locale != newLocale) {
       val newConfig = new Configuration(config)
       newConfig.locale = newLocale
       val res = getResources