Allow restoring selected backups for issue #138
This commit is contained in:
@@ -1509,7 +1509,6 @@ Public Class frmGameManager
|
|||||||
If lstGames.SelectedItems.Count > 0 Then
|
If lstGames.SelectedItems.Count > 0 Then
|
||||||
RestoreList.Clear()
|
RestoreList.Clear()
|
||||||
|
|
||||||
|
|
||||||
For Each oData In lstGames.SelectedItems
|
For Each oData In lstGames.SelectedItems
|
||||||
If oRemoteBackupData.Contains(oData.Key) Then
|
If oRemoteBackupData.Contains(oData.Key) Then
|
||||||
oGame = DirectCast(GameData(oData.Key), clsGame)
|
oGame = DirectCast(GameData(oData.Key), clsGame)
|
||||||
@@ -1524,6 +1523,12 @@ Public Class frmGameManager
|
|||||||
For Each de As DictionaryEntry In RestoreList
|
For Each de As DictionaryEntry In RestoreList
|
||||||
oGame = DirectCast(de.Key, clsGame)
|
oGame = DirectCast(de.Key, clsGame)
|
||||||
Next
|
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
|
If Not mgrRestore.CheckManifest(oGame.Name) Then
|
||||||
sMsg = mgrCommon.FormatString(frmGameManager_ConfirmRestoreAnyway, oGame.Name)
|
sMsg = mgrCommon.FormatString(frmGameManager_ConfirmRestoreAnyway, oGame.Name)
|
||||||
Else
|
Else
|
||||||
|
|||||||
Generated
+1
-1
@@ -5620,7 +5620,7 @@ Namespace My.Resources
|
|||||||
End Property
|
End Property
|
||||||
|
|
||||||
'''<summary>
|
'''<summary>
|
||||||
''' 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?.
|
||||||
'''</summary>
|
'''</summary>
|
||||||
Friend ReadOnly Property mgrBackup_ConfirmManifestConflict() As String
|
Friend ReadOnly Property mgrBackup_ConfirmManifestConflict() As String
|
||||||
Get
|
Get
|
||||||
|
|||||||
@@ -1283,7 +1283,7 @@
|
|||||||
<value>[PARAM] backup completed with warnings.</value>
|
<value>[PARAM] backup completed with warnings.</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="mgrBackup_ConfirmManifestConflict" xml:space="preserve">
|
<data name="mgrBackup_ConfirmManifestConflict" xml:space="preserve">
|
||||||
<value>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?</value>
|
<value>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?</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="mgrBackup_ConfirmOverwrite" xml:space="preserve">
|
<data name="mgrBackup_ConfirmOverwrite" xml:space="preserve">
|
||||||
<value>A file with the same name already exists in the backup folder.[BR][BR]Do you want to overwrite this file?</value>
|
<value>A file with the same name already exists in the backup folder.[BR][BR]Do you want to overwrite this file?</value>
|
||||||
|
|||||||
Reference in New Issue
Block a user