From 30ede3956c74b7a86e97ad416377e770115c1099 Mon Sep 17 00:00:00 2001
From: jianmingyong <jianming1993@gmail.com>
Date: Wed, 15 Feb 2017 22:02:27 +0800
Subject: [PATCH] Update the updater check codes.

---
 .../Screens/MainMenu/MainMenuScreen.vb        |  25 +++++++++++-------
 2.5DHero/2.5DHero/Updater.exe                 | Bin 37888 -> 37888 bytes
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/2.5DHero/2.5DHero/Screens/MainMenu/MainMenuScreen.vb b/2.5DHero/2.5DHero/Screens/MainMenu/MainMenuScreen.vb
index b91e74ecb..35738aaf0 100644
--- a/2.5DHero/2.5DHero/Screens/MainMenu/MainMenuScreen.vb
+++ b/2.5DHero/2.5DHero/Screens/MainMenu/MainMenuScreen.vb
@@ -1,5 +1,6 @@
 Imports System.Net
 Imports System.Net.Cache
+Imports System.Threading.Tasks
 
 Public Class MainMenuScreen
 
@@ -82,20 +83,26 @@ Public Class MainMenuScreen
         GameJolt.Emblem.ClearOnlineSpriteCache()
         Screen.Level.World.Initialize(Screen.Level.EnvironmentType, Screen.Level.WeatherType)
 
+        UpdateCheck()
+    End Sub
+
+    Private Sub UpdateCheck()
         Try
             If Not GameController.UpdateChecked Then
                 Logger.Debug("---Check Version---")
 
-                Dim Updater As New Process()
-                Updater.StartInfo = New ProcessStartInfo("Updater.exe")
-                Updater.Start()
-                Updater.WaitForExit()
+                Task.Factory.StartNew(Sub()
+                                          Dim Updater As New Process()
+                                          Updater.StartInfo = New ProcessStartInfo("Updater.exe")
+                                          Updater.Start()
+                                          Updater.WaitForExit()
 
-                If Updater.ExitCode = 1 Then
-                    Environment.Exit(0)
-                Else
-                    GameController.UpdateChecked = True
-                End If
+                                          If Updater.ExitCode = 1 Then
+                                              Core.GameInstance.Exit()
+                                          Else
+                                              GameController.UpdateChecked = True
+                                          End If
+                                      End Sub)
             End If
         Catch ex As Exception
         End Try
diff --git a/2.5DHero/2.5DHero/Updater.exe b/2.5DHero/2.5DHero/Updater.exe
index a9985a144b05d15aa05003efbef83b17761d71f0..9997e668d162d451dd655eacdb500d8f8f7fcee3 100644
GIT binary patch
delta 3239
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

delta 3027
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