cyanfish/naps2
1
1
Fork 0
mirror of https://github.com/cyanfish/naps2.git synced 2024-10-26 09:01:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix unnecessary error log

Browse Source
This commit is contained in:
Ben Olden-Cooligan 2024-04-08 16:25:24 -07:00
parent 41b89598c5
commit eda3c04d51
2 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
NAPS2.Lib.WinForms/EtoForms/Ui/WinFormsDesktopForm.cs
View File

@ -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();

7
NAPS2.Lib/EtoForms/Ui/DesktopForm.cs
View File

@ -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