diff --git a/GBM/Forms/frmGameManager.vb b/GBM/Forms/frmGameManager.vb index 151a889..4b2bab5 100644 --- a/GBM/Forms/frmGameManager.vb +++ b/GBM/Forms/frmGameManager.vb @@ -1330,7 +1330,7 @@ Public Class frmGameManager If mgrCommon.ShowMessage(frmGameManager_ConfirmGameDelete, oApp.Name, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then mgrMonitorList.DoListDelete(oApp.ID) - mgrMonitorList.SyncMonitorLists(Settings) + mgrMonitorList.SyncMonitorLists(Settings,, False) LoadData() eCurrentMode = eModes.Disabled ModeChange() @@ -1345,7 +1345,7 @@ Public Class frmGameManager If mgrCommon.ShowMessage(frmGameManager_ConfirmMultiGameDelete, sMonitorIDs.Count, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then mgrMonitorList.DoListDeleteMulti(sMonitorIDs) - mgrMonitorList.SyncMonitorLists(Settings) + mgrMonitorList.SyncMonitorLists(Settings,, False) LoadData() eCurrentMode = eModes.Disabled ModeChange() diff --git a/GBM/Managers/mgrMonitorList.vb b/GBM/Managers/mgrMonitorList.vb index ce8b8c9..8141ab9 100644 --- a/GBM/Managers/mgrMonitorList.vb +++ b/GBM/Managers/mgrMonitorList.vb @@ -480,7 +480,7 @@ Public Class mgrMonitorList oDatabase.RunMassParamQuery(sSQL, oParamList) End Sub - Public Shared Sub SyncMonitorLists(ByVal oSettings As mgrSettings, Optional ByVal bToRemote As Boolean = True) + Public Shared Sub SyncMonitorLists(ByVal oSettings As mgrSettings, Optional ByVal bToRemote As Boolean = True, Optional ByVal bSyncProtection As Boolean = True) Dim hshCompareFrom As Hashtable Dim hshCompareTo As Hashtable Dim hshSyncItems As Hashtable @@ -509,11 +509,15 @@ Public Class mgrMonitorList End If 'Sync Wipe Protection - If hshCompareFrom.Count = 0 And hshCompareTo.Count > 0 Then - If mgrCommon.ShowMessage(mgrMonitorList_WarningSyncProtection, MsgBoxStyle.YesNo) = MsgBoxResult.No Then - 'We will always show this one in the log regardless of setting - RaiseEvent UpdateLog(mgrMonitorList_ErrorSyncCancel, False, ToolTipIcon.Warning, True) - Exit Sub + If bSyncProtection Then + If hshCompareFrom.Count = 0 And hshCompareTo.Count > 0 Then + Cursor.Current = Cursors.Default + If mgrCommon.ShowMessage(mgrMonitorList_WarningSyncProtection, MsgBoxStyle.YesNo) = MsgBoxResult.No Then + 'We will always show this one in the log regardless of setting + RaiseEvent UpdateLog(mgrMonitorList_ErrorSyncCancel, False, ToolTipIcon.Warning, True) + Exit Sub + End If + Cursor.Current = Cursors.WaitCursor End If End If diff --git a/GBM/readme.txt b/GBM/readme.txt index 9acba03..4504f4d 100644 --- a/GBM/readme.txt +++ b/GBM/readme.txt @@ -17,5 +17,6 @@ All Platforms: - GBM now displays the full path of the detected process when multiple configurations are triggered. - Fixed an issue that could cause the certain controls to become enabled incorrectly on the Game Manager. - Fixed an issue that caused GBM not to remove empty sub-folders unless the "Use Game ID for files and folders" setting was enabled when the folder was created. +- GBM no longer displays a sync warning when the user deletes all game configurations from the Game Manager. The entire version history of GBM releases is available at http://mikemaximus.github.io/gbm-web/versionhistory.html \ No newline at end of file