From e12ca2683f5f5bb82c954782b3c57467cd33dc7c Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Wed, 21 Feb 2018 17:28:00 -0800
Subject: [PATCH] Fix incorrect "all backups loaded" flag

---
 domain-server/src/AssetsBackupHandler.cpp | 9 ++++-----
 domain-server/src/AssetsBackupHandler.h   | 1 -
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/domain-server/src/AssetsBackupHandler.cpp b/domain-server/src/AssetsBackupHandler.cpp
index b979aab993..e86c007d07 100644
--- a/domain-server/src/AssetsBackupHandler.cpp
+++ b/domain-server/src/AssetsBackupHandler.cpp
@@ -101,7 +101,10 @@ void AssetsBackupHandler::checkForAssetsToDelete() {
 
     if (deprecatedAssets.size() > 0) {
         qCDebug(asset_backup) << "Found" << deprecatedAssets.size() << "backup assets to delete from disk.";
-        if (_allBackupsLoadedSuccessfully) {
+        const auto noCorruptedBackups = none_of(begin(_backups), end(_backups), [&](const AssetServerBackup& backup) {
+            return backup.corruptedBackup;
+        });
+        if (noCorruptedBackups) {
             for (const auto& hash : deprecatedAssets) {
                 QFile::remove(_assetsDirectory + hash);
             }
@@ -175,7 +178,6 @@ void AssetsBackupHandler::loadBackup(const QString& backupName, QuaZip& zip) {
         qCCritical(asset_backup) << "Failed to find" << MAPPINGS_FILE << "while loading backup";
         qCCritical(asset_backup) << "    Error:" << zip.getZipError();
         backup.corruptedBackup = true;
-        _allBackupsLoadedSuccessfully = false;
         return;
     }
 
@@ -184,7 +186,6 @@ void AssetsBackupHandler::loadBackup(const QString& backupName, QuaZip& zip) {
         qCCritical(asset_backup) << "Could not unzip backup file for load:" << backupName;
         qCCritical(asset_backup) << "    Error:" << zip.getZipError();
         backup.corruptedBackup = true;
-        _allBackupsLoadedSuccessfully = false;
         return;
     }
 
@@ -194,7 +195,6 @@ void AssetsBackupHandler::loadBackup(const QString& backupName, QuaZip& zip) {
         qCCritical(asset_backup) << "Could not parse backup file to JSON object for load:" << backupName;
         qCCritical(asset_backup) << "    Error:" << error.errorString();
         backup.corruptedBackup = true;
-        _allBackupsLoadedSuccessfully = false;
         return;
     }
 
@@ -206,7 +206,6 @@ void AssetsBackupHandler::loadBackup(const QString& backupName, QuaZip& zip) {
         if (!AssetUtils::isValidHash(assetHash)) {
             qCCritical(asset_backup) << "Corrupted mapping in loading backup file" << backupName << ":" << it.key();
             backup.corruptedBackup = true;
-            _allBackupsLoadedSuccessfully = false;
             continue;
         }
 
diff --git a/domain-server/src/AssetsBackupHandler.h b/domain-server/src/AssetsBackupHandler.h
index f94ba43cdf..10aa7c5e7f 100644
--- a/domain-server/src/AssetsBackupHandler.h
+++ b/domain-server/src/AssetsBackupHandler.h
@@ -78,7 +78,6 @@ private:
     };
 
     // Internal storage for backups on disk
-    bool _allBackupsLoadedSuccessfully { false };
     std::vector<AssetServerBackup> _backups;
     std::set<AssetUtils::AssetHash> _assetsInBackups;
     std::set<AssetUtils::AssetHash> _assetsOnDisk;