From 0af24beb2d5b498288055ef73f0b70d7f22ac4b3 Mon Sep 17 00:00:00 2001
From: KedamaOvO <moe@mao-yu.net>
Date: Fri, 30 Nov 2018 23:18:14 +0800
Subject: [PATCH] Fix sync instance check (#58)

---
 Sync/Tools/StartupHelper.cs | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/Sync/Tools/StartupHelper.cs b/Sync/Tools/StartupHelper.cs
index 3b5ec10..81ff116 100644
--- a/Sync/Tools/StartupHelper.cs
+++ b/Sync/Tools/StartupHelper.cs
@@ -51,7 +51,7 @@ private void SyncInstanceLocker(MemoryMappedFile syncMappedFile, bool forceExit)
                             {
                                 CurrentIO.WriteColor(DefaultI18n.LANG_Instance_Exist, ConsoleColor.Red);
                                 int limit = 50, current = 0;
-                                while (oldSync.WaitForExit(100))
+                                while (!oldSync.WaitForExit(100))
                                 {
                                     current++;
                                     if (current > limit) break;
@@ -73,14 +73,6 @@ private void SyncInstanceLocker(MemoryMappedFile syncMappedFile, bool forceExit)
                 }
             }
         }
-        private void PerLuanchChecker(bool forceStart)
-        {
-            //Check sync.exe is run
-            using (var syncMappedFile = MemoryMappedFile.CreateOrOpen(SYNC_GUID, 4))
-            {
-                SyncInstanceLocker(syncMappedFile, forceStart);
-            }
-        }
 
         static void InitSync()
         {
@@ -122,15 +114,19 @@ internal StartupHelper(string[] args)
 
         internal void Start()
         {
-            PerLuanchChecker(ForceStart);
+            //Check sync.exe is run
+            using (var syncMappedFile = MemoryMappedFile.CreateOrOpen(SYNC_GUID, 4))
+            {
+                SyncInstanceLocker(syncMappedFile, ForceStart);
 
-            InitSync();
-            CurrentIO.WriteWelcome();
+                InitSync();
+                CurrentIO.WriteWelcome();
 
-            while (true)
-            {
-                var cmd = CurrentIO.ReadCommand();
-                SyncHost.Instance.Commands.invokeCmdString(cmd);
+                while (true)
+                {
+                    var cmd = CurrentIO.ReadCommand();
+                    SyncHost.Instance.Commands.invokeCmdString(cmd);
+                }
             }
         }
     }