From 68fe664ad6cd58ac59eefef96811bfdd5f6d3d0c Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 4 Aug 2022 09:29:30 +1000
Subject: [PATCH] Return early when deleting non existent filename

---
 app/Http/Middleware/SetDomainNameDb.php | 2 --
 app/Models/Backup.php                   | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Http/Middleware/SetDomainNameDb.php b/app/Http/Middleware/SetDomainNameDb.php
index 073cf03be88f..7596948867b8 100644
--- a/app/Http/Middleware/SetDomainNameDb.php
+++ b/app/Http/Middleware/SetDomainNameDb.php
@@ -50,7 +50,6 @@ class SetDomainNameDb
             ];
 
             if ($company = MultiDB::findAndSetDbByDomain($query)) {
-                //$request->merge(['company_key' => $company->company_key]);
                 session()->put('company_key', $company->company_key);
             } else {
                 if ($request->json) {
@@ -68,7 +67,6 @@ class SetDomainNameDb
             ];
 
             if ($company = MultiDB::findAndSetDbByDomain($query)) {
-                //$request->merge(['company_key' => $company->company_key]);
                 session()->put('company_key', $company->company_key);
             } else {
                 if ($request->json) {
diff --git a/app/Models/Backup.php b/app/Models/Backup.php
index 65352994c90d..2ddc96a685ae 100644
--- a/app/Models/Backup.php
+++ b/app/Models/Backup.php
@@ -51,6 +51,9 @@ class Backup extends BaseModel
     {
         nlog('deleting => '.$this->filename);
 
+        if(!$this->filename)
+            return;
+
         try {
             Storage::disk(config('filesystems.default'))->delete($this->filename);
         } catch (\Exception $e) {