diff --git a/GBM/Forms/frmGameManager.vb b/GBM/Forms/frmGameManager.vb index e103c73..594f7b6 100644 --- a/GBM/Forms/frmGameManager.vb +++ b/GBM/Forms/frmGameManager.vb @@ -884,8 +884,8 @@ Public Class frmGameManager btnExport.Enabled = True Case eModes.MultiSelect lstGames.Enabled = True - lblQuickFilter.Enabled = True - txtQuickFilter.Enabled = True + lblQuickFilter.Enabled = False + txtQuickFilter.Enabled = False WipeControls(grpConfig.Controls) WipeControls(grpExtra.Controls) WipeControls(grpStats.Controls) @@ -1202,27 +1202,34 @@ Public Class frmGameManager Dim oData As KeyValuePair(Of String, String) Dim sMsg As String = String.Empty Dim oGame As clsGame + Dim bDoBackup As Boolean = False If lstGames.SelectedItems.Count > 0 Then BackupList.Clear() For Each oData In lstGames.SelectedItems oGame = DirectCast(AppData(oData.Key), clsGame) - BackupList.Add(oGame) + 'Filter out any games set to monitor only + If Not oGame.MonitorOnly Then BackupList.Add(oGame) Next If BackupList.Count = 1 Then + bDoBackup = True sMsg = mgrCommon.FormatString(frmGameManager_ConfirmBackup, BackupList(0).Name) ElseIf BackupList.Count > 1 Then + bDoBackup = True sMsg = mgrCommon.FormatString(frmGameManager_ConfirmMultiBackup, BackupList.Count) + Else + mgrCommon.ShowMessage(frmGameManager_ErrorNoValidBackup, MsgBoxStyle.Information) End If - If mgrCommon.ShowMessage(sMsg, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then - TriggerBackup = True - Me.Close() + If bDoBackup Then + If mgrCommon.ShowMessage(sMsg, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then + TriggerBackup = True + Me.Close() + End If End If End If - End Sub Private Sub TriggerSelectedRestore() @@ -1237,7 +1244,8 @@ Public Class frmGameManager For Each oData In lstGames.SelectedItems If oRemoteBackupData.Contains(oData.Value) Then oGame = DirectCast(AppData(oData.Key), clsGame) - RestoreList.Add(oGame) + 'Filter out any games set to monitor only + If Not oGame.MonitorOnly Then RestoreList.Add(oGame) End If Next @@ -1255,7 +1263,6 @@ Public Class frmGameManager mgrCommon.ShowMessage(frmGameManager_ErrorNoBackupData, MsgBoxStyle.Information) End If - 'We need this check in case a bunch of games with no backups are multi-selected If bDoRestore Then If mgrCommon.ShowMessage(sMsg, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then TriggerRestore = True diff --git a/GBM/My Project/Resources.Designer.vb b/GBM/My Project/Resources.Designer.vb index 9dde228..65768d0 100644 --- a/GBM/My Project/Resources.Designer.vb +++ b/GBM/My Project/Resources.Designer.vb @@ -1492,7 +1492,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to The selected game(s) have no backup data.. + ''' Looks up a localized string similar to The selected game(s) have no backup data or can't be restored with their current configuration.. ''' Friend ReadOnly Property frmGameManager_ErrorNoBackupData() As String Get @@ -1527,6 +1527,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to A backup cannot be run on the selected game(s) with their current configuration.. + ''' + Friend ReadOnly Property frmGameManager_ErrorNoValidBackup() As String + Get + Return ResourceManager.GetString("frmGameManager_ErrorNoValidBackup", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to [PARAM] uses a relative path and the game path has not been set.. ''' diff --git a/GBM/My Project/Resources.resx b/GBM/My Project/Resources.resx index 72852c3..e85fca8 100644 --- a/GBM/My Project/Resources.resx +++ b/GBM/My Project/Resources.resx @@ -566,7 +566,7 @@ A game with this exact name and process already exists. - The selected game(s) have no backup data. + The selected game(s) have no backup data or can't be restored with their current configuration. The backup file does not exist. @@ -1657,4 +1657,7 @@ Quick Filter: + + A backup cannot be run on the selected game(s) with their current configuration. + \ No newline at end of file