Merge branch 'main' into release/2.12

specklesystems · Feb 8, 2023 · 19215cb · 19215cb
2 parents 3f5a9fd + 469016a
commit 19215cb
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/DesktopUI2/DesktopUI2/App.xaml.cs b/DesktopUI2/DesktopUI2/App.xaml.cs
@@ -46,16 +46,16 @@ public override void OnFrameworkInitializationCompleted()
 
       if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
       {
-        desktop.MainWindow = new MappingsWindow
-        {
-          DataContext = new MappingsViewModel(),
-        };
-
-        //desktop.MainWindow = new MainWindow
+        //desktop.MainWindow = new MappingsWindow
         //{
-        //  DataContext = new MainViewModel(),
+        //  DataContext = new MappingsViewModel(),
         //};
 
+        desktop.MainWindow = new MainWindow
+        {
+          DataContext = new MainViewModel(),
+        };
+
         //desktop.MainWindow = new Scheduler
         //{
         //  DataContext = new SchedulerViewModel(),