From aa5413fd71aeb0dbb2fb3da7eed3e1f3dd549b82 Mon Sep 17 00:00:00 2001
From: Thijs Wenker <me@thoys.nl>
Date: Wed, 1 Apr 2020 12:29:53 +0200
Subject: [PATCH 1/2] fix VS2019 (Version 16.5.1) builds

---
 libraries/gpu/src/gpu/FrameReader.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/gpu/src/gpu/FrameReader.cpp b/libraries/gpu/src/gpu/FrameReader.cpp
index d636c6aaca..96f6b99f7a 100644
--- a/libraries/gpu/src/gpu/FrameReader.cpp
+++ b/libraries/gpu/src/gpu/FrameReader.cpp
@@ -734,7 +734,7 @@ BatchPointer Deserializer::readBatch(const json& node) {
 
     std::string batchName;
     if (node.count(keys::name)) {
-        batchName = node[keys::name];
+        batchName = node.value(keys::name, "");
     }
     BatchPointer result = std::make_shared<Batch>(batchName);
     auto& batch = *result;

From 35da6721eaca0f2ff6cffb3732384f7ad9fe055c Mon Sep 17 00:00:00 2001
From: Kasen IO <kasenvr@gmail.com>
Date: Mon, 13 Apr 2020 00:24:35 -0400
Subject: [PATCH 2/2] Do not cache newly installed scripts in the more app.

---
 scripts/system/more/app-more.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/system/more/app-more.js b/scripts/system/more/app-more.js
index 99b359d9e8..1902ddf855 100644
--- a/scripts/system/more/app-more.js
+++ b/scripts/system/more/app-more.js
@@ -11,7 +11,8 @@
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//    
+//
+
 (function() {
     var ROOT = Script.resolvePath('').split("app-more.js")[0];
     var APP_NAME = "MORE...";
@@ -68,8 +69,7 @@
 
             if (instruction.action === "installScript") {
                 if (lastProcessing.action !== instruction.action || lastProcessing.script !== instruction.script) {
-                    ScriptDiscoveryService.loadOneScript(instruction.script);
-                    lastProcessing.action = instruction.action;
+                    ScriptDiscoveryService.loadScript(instruction.script, true, false, false, true, false); // Force reload the script, do not use cache.                    lastProcessing.action = instruction.action;
                     lastProcessing.script = instruction.script;
                     Script.setTimeout(function() {
                         sendRunningScriptList();