[Feature] Fix warnings / clean code (#215), version 1.0.21.0

This commit is contained in:
Markus Hofknecht 2021-10-10 18:01:29 +02:00
parent 4919aa9afd
commit b217c55bc1

View file

@ -33,7 +33,6 @@ namespace SystemTrayMenu.Business
private readonly WaitLeave waitLeave = new WaitLeave(Properties.Settings.Default.TimeUntilCloses); private readonly WaitLeave waitLeave = new WaitLeave(Properties.Settings.Default.TimeUntilCloses);
private DateTime deactivatedTime = DateTime.MinValue; private DateTime deactivatedTime = DateTime.MinValue;
private OpenCloseState openCloseState = OpenCloseState.Default; private OpenCloseState openCloseState = OpenCloseState.Default;
private RowData loadingRowData;
private bool showingMessageBox; private bool showingMessageBox;
private TaskbarPosition taskbarPosition = new WindowsTaskbar().Position; private TaskbarPosition taskbarPosition = new WindowsTaskbar().Position;
private bool searchTextChanging; private bool searchTextChanging;
@ -121,12 +120,9 @@ namespace SystemTrayMenu.Business
void StartLoadMenu(RowData rowData) void StartLoadMenu(RowData rowData)
{ {
if (menus[0].IsUsable && if (menus[0].IsUsable &&
loadingRowData != rowData &&
(menus[rowData.MenuLevel + 1] == null || (menus[rowData.MenuLevel + 1] == null ||
menus[rowData.MenuLevel + 1].Tag as RowData != rowData)) menus[rowData.MenuLevel + 1].Tag as RowData != rowData))
{ {
loadingRowData = rowData;
CreateAndShowLoadingMenu(rowData); CreateAndShowLoadingMenu(rowData);
void CreateAndShowLoadingMenu(RowData rowData) void CreateAndShowLoadingMenu(RowData rowData)
{ {
@ -198,8 +194,6 @@ namespace SystemTrayMenu.Business
ShowSubMenu(menu); ShowSubMenu(menu);
} }
} }
loadingRowData = null;
} }
} }
@ -301,7 +295,6 @@ namespace SystemTrayMenu.Business
waitLeave.Dispose(); waitLeave.Dispose();
IconReader.Dispose(); IconReader.Dispose();
DisposeMenu(menus[0]); DisposeMenu(menus[0]);
loadingRowData?.Dispose();
dgvMouseRow.Dispose(); dgvMouseRow.Dispose();
} }