diff --git a/GBM/Forms/frmGameManager.vb b/GBM/Forms/frmGameManager.vb index 9a9b1d7..375d952 100644 --- a/GBM/Forms/frmGameManager.vb +++ b/GBM/Forms/frmGameManager.vb @@ -1509,7 +1509,6 @@ Public Class frmGameManager If lstGames.SelectedItems.Count > 0 Then RestoreList.Clear() - For Each oData In lstGames.SelectedItems If oRemoteBackupData.Contains(oData.Key) Then oGame = DirectCast(GameData(oData.Key), clsGame) @@ -1524,6 +1523,12 @@ Public Class frmGameManager For Each de As DictionaryEntry In RestoreList oGame = DirectCast(de.Key, clsGame) Next + + 'FIXME: This is a really lazy fix. This whole function needs a rewrite at some point. + 'Replace backup entry with currently selected backup item in case the user wants to restore an older backup. + RestoreList.Clear() + RestoreList.Add(oGame, oCurrentBackupItem) + If Not mgrRestore.CheckManifest(oGame.Name) Then sMsg = mgrCommon.FormatString(frmGameManager_ConfirmRestoreAnyway, oGame.Name) Else diff --git a/GBM/My Project/Resources.Designer.vb b/GBM/My Project/Resources.Designer.vb index 7097a01..990aa6d 100644 --- a/GBM/My Project/Resources.Designer.vb +++ b/GBM/My Project/Resources.Designer.vb @@ -5620,7 +5620,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to The manifest shows the backup folder contains a backup for [PARAM] that has not been restored on this computer.[BR][BR]Do you want to overwrite this file anyway?. + ''' Looks up a localized string similar to The manifest shows the backup folder contains a more recent backup for [PARAM] that has not been restored on this computer.[BR][BR]Do you want to overwrite this file anyway?. ''' Friend ReadOnly Property mgrBackup_ConfirmManifestConflict() As String Get diff --git a/GBM/My Project/Resources.resx b/GBM/My Project/Resources.resx index 403c2d2..b690293 100644 --- a/GBM/My Project/Resources.resx +++ b/GBM/My Project/Resources.resx @@ -1283,7 +1283,7 @@ [PARAM] backup completed with warnings. - The manifest shows the backup folder contains a backup for [PARAM] that has not been restored on this computer.[BR][BR]Do you want to overwrite this file anyway? + The manifest shows the backup folder contains a more recent backup for [PARAM] that has not been restored on this computer.[BR][BR]Do you want to overwrite this file anyway? A file with the same name already exists in the backup folder.[BR][BR]Do you want to overwrite this file?