From 80e4bec8c823c0ac2f46686b6e745da2cf49d0c0 Mon Sep 17 00:00:00 2001
From: celeron533 <zhuyilun8@hotmail.com>
Date: Tue, 7 Aug 2018 21:54:24 +0800
Subject: [PATCH] Fix fail to register hotkeys after wake up (#1954)

---
 shadowsocks-csharp/Controller/ShadowsocksController.cs | 7 +++++--
 shadowsocks-csharp/Program.cs                          | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/shadowsocks-csharp/Controller/ShadowsocksController.cs b/shadowsocks-csharp/Controller/ShadowsocksController.cs
index d25cc494..6daaa68a 100644
--- a/shadowsocks-csharp/Controller/ShadowsocksController.cs
+++ b/shadowsocks-csharp/Controller/ShadowsocksController.cs
@@ -89,10 +89,13 @@ namespace Shadowsocks.Controller
             StartTrafficStatistics(61);
         }
 
-        public void Start()
+        public void Start(bool regHotkeys = true)
         {
             Reload();
-            HotkeyReg.RegAllHotkeys();
+            if (regHotkeys)
+            {
+                HotkeyReg.RegAllHotkeys();
+            }
         }
 
         protected void ReportError(Exception e)
diff --git a/shadowsocks-csharp/Program.cs b/shadowsocks-csharp/Program.cs
index 50f56d25..551b9082 100755
--- a/shadowsocks-csharp/Program.cs
+++ b/shadowsocks-csharp/Program.cs
@@ -127,7 +127,7 @@ namespace Shadowsocks
                             Thread.Sleep(10 * 1000);
                             try
                             {
-                                MainController.Start();
+                                MainController.Start(false);
                                 Logging.Info("controller started");
                             }
                             catch (Exception ex)