fix: full backup check (#191)

alexsee · May 6, 2023 · 3ba189c · 3ba189c
1 parent ace0bf0
commit 3ba189c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/src/BSH.Main/Dialogs/frmBrowser.cs b/src/BSH.Main/Dialogs/frmBrowser.cs
@@ -1480,13 +1480,13 @@ private async void cmdTakeMeBack_Click(object sender, EventArgs e)
                 }
 
                 // Version suchen, in der die Datei ist
-                string Result = await BackupLogic.GlobalBackup.QueryManager.GetBackVersionWhereFileAsync(selectedVersion.Id, txtSearch.Text);
-                if (Result is null)
+                var backupVersion = await BackupLogic.GlobalBackup.QueryManager.GetBackVersionWhereFileAsync(selectedVersion.Id, txtSearch.Text);
+                if (backupVersion == null)
                 {
                     return;
                 }
 
-                selectedVersion = await BackupLogic.GlobalBackup.QueryManager.GetVersionByIdAsync(Result);
+                selectedVersion = await BackupLogic.GlobalBackup.QueryManager.GetVersionByIdAsync(backupVersion);
 
                 // Alles leeren
                 lvFiles.Items.Clear();
@@ -1499,13 +1499,13 @@ private async void cmdTakeMeBack_Click(object sender, EventArgs e)
             }
             else
             {
-                string Result = await BackupLogic.GlobalBackup.QueryManager.GetBackVersionWhereFilesInFolderAsync(selectedVersion.Id, selectedFolder);
-                if (Result is null)
+                var backupVersion = await BackupLogic.GlobalBackup.QueryManager.GetBackVersionWhereFilesInFolderAsync(selectedVersion.Id, selectedFolder);
+                if (backupVersion == null)
                 {
                     return;
                 }
 
-                AVersionList1.SelectItem(Result);
+                AVersionList1.SelectItem(backupVersion);
             }
         }
 
@@ -1526,13 +1526,13 @@ private async void cmdTakeMeLater_Click(object sender, EventArgs e)
                 }
 
                 // Version suchen, in der die Datei ist
-                string Result = await BackupLogic.GlobalBackup.QueryManager.GetNextVersionWhereFileAsync(selectedVersion.Id, txtSearch.Text);
-                if (Result is null)
+                var backupVersion = await BackupLogic.GlobalBackup.QueryManager.GetNextVersionWhereFileAsync(selectedVersion.Id, txtSearch.Text);
+                if (backupVersion == null)
                 {
                     return;
                 }
 
-                selectedVersion = await BackupLogic.GlobalBackup.QueryManager.GetVersionByIdAsync(Result);
+                selectedVersion = await BackupLogic.GlobalBackup.QueryManager.GetVersionByIdAsync(backupVersion);
                 lvFiles.Items.Clear();
 
                 // Nun neuen Prozess starten
@@ -1543,13 +1543,13 @@ private async void cmdTakeMeLater_Click(object sender, EventArgs e)
             }
             else
             {
-                string Result = await BackupLogic.GlobalBackup.QueryManager.GetNextVersionWhereFilesInFolderAsync(selectedVersion.Id, selectedFolder);
-                if (Result is null)
+                var backupVersion = await BackupLogic.GlobalBackup.QueryManager.GetNextVersionWhereFilesInFolderAsync(selectedVersion.Id, selectedFolder);
+                if (backupVersion == null)
                 {
                     return;
                 }
 
-                AVersionList1.SelectItem(Result);
+                AVersionList1.SelectItem(backupVersion);
             }
         }
 

diff --git a/src/BSH.Main/Modules/BackupLogic.cs b/src/BSH.Main/Modules/BackupLogic.cs
@@ -651,8 +651,11 @@ public async static Task thScheduleSysRunBackup()
                 if (Item[0] == "day")
                 {
                     var lastFullBackup = await GlobalBackup.QueryManager.GetLastFullBackupAsync();
-                    var Diff = DateTime.Now.Subtract(lastFullBackup.CreationDate);
-                    FullBackup = Diff.Days >= Convert.ToInt32(Item[1]);
+                    if (lastFullBackup != null)
+                    {
+                        var Diff = DateTime.Now.Subtract(lastFullBackup.CreationDate);
+                        FullBackup = Diff.Days >= Convert.ToInt32(Item[1]);
+                    }
                 }
             }