From efa60faace4915fb570102e37173ce756db7b9e0 Mon Sep 17 00:00:00 2001 From: Justin Swanson Date: Mon, 14 Oct 2019 19:04:08 -0500 Subject: [PATCH] MainWindow spawns on ModeSelectionWindow --- Wabbajack/UI/ModeSelectionWindow.xaml.cs | 31 ++++++++++++------------ 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/Wabbajack/UI/ModeSelectionWindow.xaml.cs b/Wabbajack/UI/ModeSelectionWindow.xaml.cs index 9a9dcf16..ea6d775f 100644 --- a/Wabbajack/UI/ModeSelectionWindow.xaml.cs +++ b/Wabbajack/UI/ModeSelectionWindow.xaml.cs @@ -27,27 +27,28 @@ namespace Wabbajack private void CreateModlist_Click(object sender, RoutedEventArgs e) { - var file = UIUtils.OpenFileDialog("MO2 Modlist(modlist.txt)|modlist.txt"); - if (file != null) - { - ShutdownOnClose = false; - new MainWindow(RunMode.Compile, file).Show(); - Close(); - } + OpenMainWindow( + RunMode.Compile, + UIUtils.OpenFileDialog("MO2 Modlist(modlist.txt)|modlist.txt")); } private void InstallModlist_Click(object sender, RoutedEventArgs e) { - var file = UIUtils.OpenFileDialog($"Wabbajack Modlist (*{Consts.ModlistExtension})|*{Consts.ModlistExtension}"); - if (file != null) - { - ShutdownOnClose = false; - new MainWindow(RunMode.Install, file).Show(); - Close(); - } + OpenMainWindow( + RunMode.Install, + UIUtils.OpenFileDialog($"Wabbajack Modlist (*{Consts.ModlistExtension})|*{Consts.ModlistExtension}")); } - + private void OpenMainWindow(RunMode mode, string file) + { + if (file == null) return; + ShutdownOnClose = false; + var window = new MainWindow(mode, file); + window.Left = this.Left; + window.Top = this.Top; + window.Show(); + Close(); + } public void Close_Window(object sender, CancelEventArgs e) {