From eda3c04d519d61171e0e5c5b8b672a96446e9135 Mon Sep 17 00:00:00 2001
From: Ben Olden-Cooligan <ben.cyanfish@gmail.com>
Date: Mon, 8 Apr 2024 16:25:24 -0700
Subject: [PATCH] Fix unnecessary error log

---
 .../EtoForms/Ui/WinFormsDesktopForm.cs              | 13 -------------
 NAPS2.Lib/EtoForms/Ui/DesktopForm.cs                |  7 +------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/NAPS2.Lib.WinForms/EtoForms/Ui/WinFormsDesktopForm.cs b/NAPS2.Lib.WinForms/EtoForms/Ui/WinFormsDesktopForm.cs
index c14515bc8..4366204f7 100644
--- a/NAPS2.Lib.WinForms/EtoForms/Ui/WinFormsDesktopForm.cs
+++ b/NAPS2.Lib.WinForms/EtoForms/Ui/WinFormsDesktopForm.cs
@@ -16,8 +16,6 @@ namespace NAPS2.EtoForms.Ui;
 
 public class WinFormsDesktopForm : DesktopForm
 {
-    public static WF.ApplicationContext? ApplicationContext { get; set; }
-
     private readonly Dictionary<DesktopToolbarMenuType, WF.ToolStripSplitButton> _menuButtons = new();
     private readonly ToolbarFormatter _toolbarFormatter = new(new StringWrapper());
     private readonly WF.Form _form;
@@ -109,17 +107,6 @@ public class WinFormsDesktopForm : DesktopForm
 
     private WF.ListView NativeListView => ((WinFormsListView<UiImage>) _listView).NativeControl;
 
-    protected override void SetMainForm(Form newMainForm)
-    {
-        base.SetMainForm(newMainForm);
-        if (ApplicationContext == null)
-        {
-            Log.Error("ApplicationContext should not be null");
-            return;
-        }
-        ApplicationContext.MainForm = newMainForm.ToSWF();
-    }
-
     protected override void SetCulture(string cultureId)
     {
         SaveToolStripLocation();
diff --git a/NAPS2.Lib/EtoForms/Ui/DesktopForm.cs b/NAPS2.Lib/EtoForms/Ui/DesktopForm.cs
index c6463a9db..14d6c4485 100644
--- a/NAPS2.Lib/EtoForms/Ui/DesktopForm.cs
+++ b/NAPS2.Lib/EtoForms/Ui/DesktopForm.cs
@@ -454,7 +454,7 @@ public abstract class DesktopForm : EtoFormBase
             FormStateController.DoSaveFormState();
             var newDesktop = FormFactory.Create<DesktopForm>();
             newDesktop.Show();
-            SetMainForm(newDesktop);
+            Application.Instance.MainForm = newDesktop;
             Close();
         }
         finally
@@ -464,11 +464,6 @@ public abstract class DesktopForm : EtoFormBase
         // TODO: If we make any other forms non-modal, we will need to refresh them too
     }
 
-    protected virtual void SetMainForm(Form newMainForm)
-    {
-        Application.Instance.MainForm = newMainForm;
-    }
-
     protected virtual void UpdateToolbar()
     {
         // Top-level toolbar items