From 2ae705be18a29a4282d2902aed363b6d8a5213f3 Mon Sep 17 00:00:00 2001
From: MikeMaximus <mseiferling@gmail.com>
Date: Mon, 2 Jul 2018 09:23:39 -0600
Subject: [PATCH] Fixed removing sub-folders when game name includes unsafe
 characters

---
 GBM/Classes/clsBackup.vb  | 6 ++++++
 GBM/Managers/mgrCommon.vb | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/GBM/Classes/clsBackup.vb b/GBM/Classes/clsBackup.vb
index 36ca950..f790844 100644
--- a/GBM/Classes/clsBackup.vb
+++ b/GBM/Classes/clsBackup.vb
@@ -47,6 +47,12 @@
         End Get
     End Property
 
+    ReadOnly Property FileSafeName As String
+        Get
+            Return mgrPath.ValidateFileNameForOS(sName)
+        End Get
+    End Property
+
     Property FileName As String
         Get
             If mgrCommon.IsUnix Then
diff --git a/GBM/Managers/mgrCommon.vb b/GBM/Managers/mgrCommon.vb
index ccdeb1a..2f3ca54 100644
--- a/GBM/Managers/mgrCommon.vb
+++ b/GBM/Managers/mgrCommon.vb
@@ -437,8 +437,8 @@ Public Class mgrCommon
         'Check if the sub-folder is an ID or Name
         If oBackup.FileName.StartsWith(oBackup.MonitorID & Path.DirectorySeparatorChar) Then
             sDir = sBackupFolder & oBackup.MonitorID
-        ElseIf oBackup.FileName.StartsWith(oBackup.Name & Path.DirectorySeparatorChar) Then
-            sDir = sBackupFolder & oBackup.Name
+        ElseIf oBackup.FileName.StartsWith(oBackup.FileSafeName & Path.DirectorySeparatorChar) Then
+            sDir = sBackupFolder & oBackup.FileSafeName
         Else
             Exit Sub
         End If