From 321c72b6bf647fe9e7342c19573476c6d8319b45 Mon Sep 17 00:00:00 2001
From: "Michael J. Seiferling" <mseiferling@gmail.com>
Date: Thu, 3 Mar 2016 19:28:04 -0600
Subject: [PATCH] Minor restore fixes

---
 GBM/Classes/clsBackup.vb   |  6 +++++-
 GBM/Managers/mgrRestore.vb | 20 ++++++++++++--------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/GBM/Classes/clsBackup.vb b/GBM/Classes/clsBackup.vb
index b45fa0e..eef77cc 100644
--- a/GBM/Classes/clsBackup.vb
+++ b/GBM/Classes/clsBackup.vb
@@ -41,7 +41,11 @@
 
     Property FileName As String
         Get
-            Return sFileName
+            If mgrCommon.IsUnix Then
+                Return sFileName.Replace("\", "/")
+            Else
+                Return sFileName.Replace("/", "\")
+            End If
         End Get
         Set(value As String)
             sFileName = value
diff --git a/GBM/Managers/mgrRestore.vb b/GBM/Managers/mgrRestore.vb
index 52cdf92..e6436ce 100644
--- a/GBM/Managers/mgrRestore.vb
+++ b/GBM/Managers/mgrRestore.vb
@@ -232,7 +232,11 @@ Public Class mgrRestore
             If bDoRestore Then
                 Try
                     If File.Exists(sBackupFile) Then
-                        prs7z.StartInfo.Arguments = "x """ & sBackupFile & """ -o""" & sExtractPath & Path.DirectorySeparatorChar & """ -aoa -r"
+                        If mgrCommon.IsUnix Then
+                            prs7z.StartInfo.Arguments = "x """ & sBackupFile & """ -o""" & sExtractPath & Path.DirectorySeparatorChar & """ -aoa -r"
+                        Else
+                            prs7z.StartInfo.Arguments = "x -bb1 -bt """ & sBackupFile & """ -o""" & sExtractPath & Path.DirectorySeparatorChar & """ -aoa -r"
+                        End If
                         prs7z.StartInfo.FileName = mgrPath.Utility7zLocation
                         prs7z.StartInfo.UseShellExecute = False
                         prs7z.StartInfo.RedirectStandardOutput = True
@@ -262,14 +266,14 @@ Public Class mgrRestore
                         RaiseEvent UpdateLog(mgrRestore_ErrorNoBackup, True, ToolTipIcon.Error, True)
                     End If
 
-                    If bRestoreCompleted Then
-                        'Save Local Manifest
-                        If mgrManifest.DoManifestCheck(oBackupInfo.Name, mgrSQLite.Database.Local) Then
-                            mgrManifest.DoManifestUpdate(oBackupInfo, mgrSQLite.Database.Local)
-                        Else
-                            mgrManifest.DoManifestAdd(oBackupInfo, mgrSQLite.Database.Local)
+                        If bRestoreCompleted Then
+                            'Save Local Manifest
+                            If mgrManifest.DoManifestCheck(oBackupInfo.Name, mgrSQLite.Database.Local) Then
+                                mgrManifest.DoManifestUpdate(oBackupInfo, mgrSQLite.Database.Local)
+                            Else
+                                mgrManifest.DoManifestAdd(oBackupInfo, mgrSQLite.Database.Local)
+                            End If
                         End If
-                    End If
                 Catch ex As Exception
                     RaiseEvent UpdateLog(mgrCommon.FormatString(mgrRestore_ErrorOtherFailure, ex.Message), False, ToolTipIcon.Error, True)
                 End Try