From 218ce3f367fc2064eac8e172b3303322d8d8dfec Mon Sep 17 00:00:00 2001
From: MikeMaximus <mseiferling@gmail.com>
Date: Thu, 21 Jun 2018 11:08:10 -0600
Subject: [PATCH] Changes for issue #135

---
 GBM/Managers/mgrBackup.vb            | 11 +++++++++--
 GBM/My Project/Resources.Designer.vb | 11 ++++++++++-
 GBM/My Project/Resources.resx        |  5 ++++-
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/GBM/Managers/mgrBackup.vb b/GBM/Managers/mgrBackup.vb
index 708e4ba..38e8d78 100644
--- a/GBM/Managers/mgrBackup.vb
+++ b/GBM/Managers/mgrBackup.vb
@@ -116,6 +116,7 @@ Public Class mgrBackup
     Public Function CheckBackupPrereq(ByVal oGame As clsGame) As Boolean
         Dim sBackupFile As String = oSettings.BackupFolder
         Dim sSavePath As String
+        Dim sOverwriteMessage As String
         Dim lAvailableSpace As Long
         Dim lFolderSize As Long
 
@@ -150,13 +151,19 @@ Public Class mgrBackup
         End If
 
         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)
                 Return False
             End If
         End If
 
-        Return True
+            Return True
     End Function
 
     Private Sub CheckOldBackups(ByVal oGame As clsGame)
diff --git a/GBM/My Project/Resources.Designer.vb b/GBM/My Project/Resources.Designer.vb
index 8b87fcb..7097a01 100644
--- a/GBM/My Project/Resources.Designer.vb	
+++ b/GBM/My Project/Resources.Designer.vb	
@@ -2698,7 +2698,7 @@ Namespace My.Resources
         End Property
         
         '''<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>
         Friend ReadOnly Property frmIncludeExclude_RawEditInfo() As String
             Get
@@ -5637,6 +5637,15 @@ Namespace My.Resources
             End Get
         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>
         '''  Looks up a localized string similar to Backup aborted due to lack of disk space..
         '''</summary>
diff --git a/GBM/My Project/Resources.resx b/GBM/My Project/Resources.resx
index 46dabaa..403c2d2 100644
--- a/GBM/My Project/Resources.resx	
+++ b/GBM/My Project/Resources.resx	
@@ -2188,4 +2188,7 @@
   <data name="frmSettings_lstSettings_Startup" xml:space="preserve">
     <value>Startup</value>
   </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>
\ No newline at end of file