From 70a90a1077d5490e63724a8a870a2104552779f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EC=A0=95=ED=9B=88?= Date: Fri, 19 Apr 2019 18:22:31 +0900 Subject: [PATCH] bug Fiexd 0.3.2.2 --- EUD Editor 3/MainWindow/MainWindowD.xaml.vb | 36 +++++++++++++++------ EUD Editor 3/Module/GlobalObj.vb | 21 +++--------- EUD Editor 3/My Project/AssemblyInfo.vb | 4 +-- 3 files changed, 33 insertions(+), 28 deletions(-) diff --git a/EUD Editor 3/MainWindow/MainWindowD.xaml.vb b/EUD Editor 3/MainWindow/MainWindowD.xaml.vb index f8dc49ce..6891d04d 100644 --- 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 index f4ea3b59..b042c706 100644 --- 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 index aa24ba43..d95c3471 100644 --- a/EUD Editor 3/My Project/AssemblyInfo.vb +++ b/EUD Editor 3/My Project/AssemblyInfo.vb @@ -55,5 +55,5 @@ Imports System.Windows ' 지정되도록 할 수 있습니다. ' - - + +