diff --git a/GBM/Managers/mgrBackup.vb b/GBM/Managers/mgrBackup.vb index 4119bea..8b8cbc1 100644 --- a/GBM/Managers/mgrBackup.vb +++ b/GBM/Managers/mgrBackup.vb @@ -238,13 +238,20 @@ Public Class mgrBackup End While prs7z.WaitForExit() If Not CancelOperation Then - If prs7z.ExitCode = 0 Then - RaiseEvent UpdateLog(mgrCommon.FormatString(mgrBackup_BackupComplete, New String() {oGame.Name, mgrCommon.FormatDiskSpace(mgrCommon.GetFileSize(sBackupFile))}), False, ToolTipIcon.Info, True) - bBackupCompleted = True - Else - RaiseEvent UpdateLog(mgrCommon.FormatString(mgrBackup_BackupWarnings, oGame.Name), True, ToolTipIcon.Warning, True) - bBackupCompleted = False - End If + Select Case prs7z.ExitCode + Case 0 + RaiseEvent UpdateLog(mgrCommon.FormatString(mgrBackup_BackupComplete, New String() {oGame.Name, mgrCommon.FormatDiskSpace(mgrCommon.GetFileSize(sBackupFile))}), False, ToolTipIcon.Info, True) + bBackupCompleted = True + Case 1 + RaiseEvent UpdateLog(mgrCommon.FormatString(mgrBackup_7zWarnings, oGame.Name), True, ToolTipIcon.Warning, True) + bBackupCompleted = True + Case 2 + RaiseEvent UpdateLog(mgrCommon.FormatString(mgrBackup_7zFatalError, oGame.Name), True, ToolTipIcon.Error, True) + bBackupCompleted = False + Case 7 + RaiseEvent UpdateLog(mgrCommon.FormatString(mgrBackup_7zCommandFailure, oGame.Name), True, ToolTipIcon.Error, True) + bBackupCompleted = False + End Select End If prs7z.Dispose() Else diff --git a/GBM/My Project/Resources.Designer.vb b/GBM/My Project/Resources.Designer.vb index 2b37815..89ad774 100644 --- a/GBM/My Project/Resources.Designer.vb +++ b/GBM/My Project/Resources.Designer.vb @@ -4456,6 +4456,33 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to [PARAM] backup failed due to a malformed command.. + ''' + Friend ReadOnly Property mgrBackup_7zCommandFailure() As String + Get + Return ResourceManager.GetString("mgrBackup_7zCommandFailure", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to [PARAM] backup failed due to an error.. + ''' + Friend ReadOnly Property mgrBackup_7zFatalError() As String + Get + Return ResourceManager.GetString("mgrBackup_7zFatalError", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to [PARAM] backup completed with warnings.. + ''' + Friend ReadOnly Property mgrBackup_7zWarnings() As String + Get + Return ResourceManager.GetString("mgrBackup_7zWarnings", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to [PARAM] backup completed.. ''' @@ -4501,15 +4528,6 @@ Namespace My.Resources End Get End Property - ''' - ''' Looks up a localized string similar to [PARAM] backup finished with warnings or errors.. - ''' - Friend ReadOnly Property mgrBackup_BackupWarnings() As String - Get - Return ResourceManager.GetString("mgrBackup_BackupWarnings", resourceCulture) - End Get - End Property - ''' ''' Looks up a localized string similar to You may not have enough disk space available to perform a backup.[BR][BR]Do you want to continue anyway?. ''' diff --git a/GBM/My Project/Resources.resx b/GBM/My Project/Resources.resx index 180eebc..b9a5d75 100644 --- a/GBM/My Project/Resources.resx +++ b/GBM/My Project/Resources.resx @@ -1297,8 +1297,8 @@ Backup of [PARAM] in progress... - - [PARAM] backup finished with warnings or errors. + + [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? @@ -1792,4 +1792,10 @@ [PARAM] B + + [PARAM] backup failed due to a malformed command. + + + [PARAM] backup failed due to an error. + \ No newline at end of file