Changes for issue #135

This commit is contained in:
MikeMaximus
2018-06-21 11:08:10 -06:00
parent b3cfab7ee6
commit 218ce3f367
3 changed files with 23 additions and 4 deletions
+9 -2
View File
@@ -116,6 +116,7 @@ Public Class mgrBackup
Public Function CheckBackupPrereq(ByVal oGame As clsGame) As Boolean Public Function CheckBackupPrereq(ByVal oGame As clsGame) As Boolean
Dim sBackupFile As String = oSettings.BackupFolder Dim sBackupFile As String = oSettings.BackupFolder
Dim sSavePath As String Dim sSavePath As String
Dim sOverwriteMessage As String
Dim lAvailableSpace As Long Dim lAvailableSpace As Long
Dim lFolderSize As Long Dim lFolderSize As Long
@@ -150,13 +151,19 @@ Public Class mgrBackup
End If End If
If oSettings.ShowOverwriteWarning And File.Exists(sBackupFile) And Not oGame.AppendTimeStamp Then If oSettings.ShowOverwriteWarning And File.Exists(sBackupFile) And Not oGame.AppendTimeStamp Then
If mgrCommon.ShowMessage(mgrBackup_ConfirmOverwrite, MsgBoxStyle.YesNo) = MsgBoxResult.No Then If oGame.AbsolutePath Then
sOverwriteMessage = mgrBackup_ConfirmOverwrite
Else
sOverwriteMessage = mgrBackup_ConfirmOverwriteRelative
End If
If mgrCommon.ShowMessage(sOverwriteMessage, MsgBoxStyle.YesNo) = MsgBoxResult.No Then
RaiseEvent UpdateLog(mgrCommon.FormatString(mgrBackup_ErrorOverwriteAbort, oGame.Name), False, ToolTipIcon.Error, True) RaiseEvent UpdateLog(mgrCommon.FormatString(mgrBackup_ErrorOverwriteAbort, oGame.Name), False, ToolTipIcon.Error, True)
Return False Return False
End If End If
End If End If
Return True Return True
End Function End Function
Private Sub CheckOldBackups(ByVal oGame As clsGame) Private Sub CheckOldBackups(ByVal oGame As clsGame)
+10 -1
View File
@@ -2698,7 +2698,7 @@ Namespace My.Resources
End Property End Property
'''<summary> '''<summary>
''' Looks up a localized string similar to Items are semi-colon delimited.. ''' Looks up a localized string similar to Items are colon delimited..
'''</summary> '''</summary>
Friend ReadOnly Property frmIncludeExclude_RawEditInfo() As String Friend ReadOnly Property frmIncludeExclude_RawEditInfo() As String
Get Get
@@ -5637,6 +5637,15 @@ Namespace My.Resources
End Get End Get
End Property End Property
'''<summary>
''' Looks up a localized string similar to A file with the same name already exists in the backup folder.[BR][BR]This game stores saves in a relative location, you may need to restore the current backup if the game was recently re-installed.[BR][BR]Do you want to overwrite this file?.
'''</summary>
Friend ReadOnly Property mgrBackup_ConfirmOverwriteRelative() As String
Get
Return ResourceManager.GetString("mgrBackup_ConfirmOverwriteRelative", resourceCulture)
End Get
End Property
'''<summary> '''<summary>
''' Looks up a localized string similar to Backup aborted due to lack of disk space.. ''' Looks up a localized string similar to Backup aborted due to lack of disk space..
'''</summary> '''</summary>
+4 -1
View File
@@ -2188,4 +2188,7 @@
<data name="frmSettings_lstSettings_Startup" xml:space="preserve"> <data name="frmSettings_lstSettings_Startup" xml:space="preserve">
<value>Startup</value> <value>Startup</value>
</data> </data>
</root> <data name="mgrBackup_ConfirmOverwriteRelative" xml:space="preserve">
<value>A file with the same name already exists in the backup folder.[BR][BR]This game stores saves in a relative location, you may need to restore the current backup if the game was recently re-installed.[BR][BR]Do you want to overwrite this file?</value>
</data>
</root>