bug Fiexd 0.3.2.2

Buizz · Apr 19, 2019 · 70a90a1 · 70a90a1
1 parent 7c62bd5
commit 70a90a1
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 28 deletions.
diff --git a/EUD Editor 3/MainWindow/MainWindowD.xaml.vb b/EUD Editor 3/MainWindow/MainWindowD.xaml.vb
@@ -1,30 +1,32 @@
 Imports System.Windows.Threading
 Imports System.Windows.Interop
-
+Imports System.ComponentModel
 
 Public Class MainWindowD
-
+    Private BackGroundWorker As BackgroundWorker
 
     Private Sub Window_Loaded(sender As Object, e As RoutedEventArgs)
         InitProgram()
-        Thread = New Task(AddressOf ProgramLoad)
-        Thread.Start()
+        BackGroundWorker = New BackgroundWorker()
+        AddHandler BackGroundWorker.DoWork, AddressOf BackgroundWorker1_DoWork
+        AddHandler BackGroundWorker.RunWorkerCompleted, AddressOf BackgroundWorker1_RunWorkerCompleted
 
+        BackGroundWorker.RunWorkerAsync()
+    End Sub
+    Private Sub BackgroundWorker1_DoWork(ByVal sender As System.Object, ByVal e As System.ComponentModel.DoWorkEventArgs)
+        ProgramLoad()
+    End Sub
+    Private Sub BackgroundWorker1_RunWorkerCompleted(ByVal sender As System.Object, ByVal e As System.ComponentModel.RunWorkerCompletedEventArgs)
+        ProgramLoadCmp()
     End Sub
-
 
     Private Sub MetroWindow_Unloaded(sender As Object, e As RoutedEventArgs)
 
     End Sub
 
-
-
     Private IsProgramLoad As Boolean = False
     Private ControlBar As ProjectControl
 
-
-    Private Thread As Task
-
     Private Sub ProgramLoad()
         InitProgramDatas()
 
@@ -39,6 +41,20 @@ Public Class MainWindowD
                                                                     ProjectControlBinding.PropertyChangedPack()
                                                                 End Sub))
     End Sub
+    Private Sub ProgramLoadCmp()
+        If pgData.Setting(ProgramData.TSetting.CheckReg) Then
+            If Tool.CheckexeConnect("e3s") Then
+                Dim dialogResult As MsgBoxResult = MsgBox(Tool.GetText("RegistryConnect"), MsgBoxStyle.YesNoCancel)
+                If dialogResult = MsgBoxResult.Yes Then
+                    SettiingForm = New SettingWindows
+                    SettiingForm.ShowDialog()
+                    'Tool.StartRegSetter()
+                ElseIf dialogResult = MsgBoxResult.Cancel Then
+                    pgData.Setting(ProgramData.TSetting.CheckReg) = False
+                End If
+            End If
+        End If
+    End Sub
 
 
 

diff --git a/EUD Editor 3/Module/GlobalObj.vb b/EUD Editor 3/Module/GlobalObj.vb
@@ -1,4 +1,7 @@
-Module GlobalObj
+Imports System.Windows.Threading
+Imports System.Windows.Interop
+
+Module GlobalObj
     Public pgData As ProgramData
     Public pjData As ProjectData
     Public scData As StarCraftData
@@ -18,6 +21,7 @@
             Return False
         End Try
 
+
         If Environment.GetCommandLineArgs.Count > 1 Then
             Dim filename As String = Environment.GetCommandLineArgs(1)
             ProjectData.Load(filename, pjData)
@@ -139,21 +143,6 @@
 
 
 
-        If pgData.Setting(ProgramData.TSetting.CheckReg) Then
-            If Tool.CheckexeConnect("e3s") Then
-                Dim dialogResult As MsgBoxResult = MsgBox(Tool.GetText("RegistryConnect"), MsgBoxStyle.YesNoCancel)
-                If dialogResult = MsgBoxResult.Yes Then
-                    SettiingForm = New SettingWindows
-                    SettiingForm.ShowDialog()
-                    'Tool.StartRegSetter()
-                ElseIf dialogResult = MsgBoxResult.Cancel Then
-                    pgData.Setting(ProgramData.TSetting.CheckReg) = False
-                End If
-            End If
-        End If
-
-
-
         Return True
     End Function
 

diff --git a/EUD Editor 3/My Project/AssemblyInfo.vb b/EUD Editor 3/My Project/AssemblyInfo.vb
@@ -55,5 +55,5 @@ Imports System.Windows
 ' 지정되도록 할 수 있습니다.
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("0.3.2.1")>
-<Assembly: AssemblyFileVersion("0.3.2.1")>
+<Assembly: AssemblyVersion("0.3.2.2")>
+<Assembly: AssemblyFileVersion("0.3.2.2")>