From 3822f92882156160d128b4a08804219c92af784d Mon Sep 17 00:00:00 2001
From: chcurran <82187351+carlitosan@users.noreply.github.com>
Date: Thu, 2 Sep 2021 17:32:53 -0700
Subject: [PATCH] fix manual inpsection window

Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
---
 .../Code/Builder/ScriptCanvasBuilderWorker.cpp         | 10 +++++-----
 .../Code/Editor/Components/GraphUpgrade.cpp            |  6 +++---
 .../View/Windows/Tools/UpgradeTool/VersionExplorer.cpp |  7 ++++++-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorker.cpp b/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorker.cpp
index 775b280602..ecb28b60c6 100644
--- a/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorker.cpp
+++ b/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorker.cpp
@@ -315,11 +315,11 @@ namespace ScriptCanvasBuilder
         else
         {
             // force load all dependencies into memory
-            for (auto& dependency : m_processEditorAssetDependencies)
-            {
-                auto depAsset = AZ::Data::AssetManager::Instance().GetAsset(dependency.m_assetId, dependency.m_assetType, AZ::Data::AssetLoadBehavior::PreLoad);
-                depAsset.BlockUntilLoadComplete();
-            }
+//             for (auto& dependency : m_processEditorAssetDependencies)
+//             {
+//                 auto depAsset = AZ::Data::AssetManager::Instance().GetAsset(dependency.m_assetId, dependency.m_assetType, AZ::Data::AssetLoadBehavior::PreLoad);
+//                 depAsset.BlockUntilLoadComplete();
+//             }
 
             AZ::Entity* buildEntity = asset.Get()->GetScriptCanvasEntity();
 
diff --git a/Gems/ScriptCanvas/Code/Editor/Components/GraphUpgrade.cpp b/Gems/ScriptCanvas/Code/Editor/Components/GraphUpgrade.cpp
index f1c9a1455b..53b37ef4e9 100644
--- a/Gems/ScriptCanvas/Code/Editor/Components/GraphUpgrade.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/Components/GraphUpgrade.cpp
@@ -515,13 +515,13 @@ namespace ScriptCanvasEditor
 
         ScriptCanvas::Grammar::g_saveRawTranslationOuputToFile = saveRawTranslationOuputToFile;
 
-        if (validationResults.HasResults())
+        if (validationResults.HasErrors())
         {
+            AZ::Interface<IUpgradeRequests>::Get()->GraphNeedsManualUpgrade(sm->m_asset.GetId());
+
             for (auto& err : validationResults.GetEvents())
             {
                 // Register this graph as needing manual updates
-                AZ::Interface<IUpgradeRequests>::Get()->GraphNeedsManualUpgrade(sm->m_asset.GetId());
-
                 Log("%s: %s\n", err->GetIdentifier().c_str(), err->GetDescription().data());
             }
         }
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/VersionExplorer.cpp b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/VersionExplorer.cpp
index eb7c609bee..bdf7f2926c 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/VersionExplorer.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/VersionExplorer.cpp
@@ -230,7 +230,7 @@ namespace ScriptCanvasEditor
                 m_upgradeComplete = false;
             }
 
-            if (!IsUpgrading())
+            if (!IsUpgrading() && m_state == ProcessState::Upgrade)
             {
                 AZStd::string errorMessage = BackupGraph(*m_inProgressAsset);
                 // Make the backup
@@ -616,6 +616,11 @@ namespace ScriptCanvasEditor
             }
         }
 
+        if (m_upgradeResult == OperationResult::Failure)
+        {
+            AZ::Interface<IUpgradeRequests>::Get()->GraphNeedsManualUpgrade(asset.GetId());
+        }
+
         m_tmpFileName.clear();
     }