From 6974208fa3cc581447c753967edd8109b304cd75 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Fri, 1 Dec 2017 14:05:37 -0800
Subject: [PATCH] Fix variable_map_test and variable_model_test

---
 core/xml.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/core/xml.js b/core/xml.js
index a88de9a6e..f71c3b52a 100644
--- a/core/xml.js
+++ b/core/xml.js
@@ -87,13 +87,17 @@ Blockly.Xml.blockToDomWithXY = function(block, opt_noId) {
 };
 
 Blockly.Xml.fieldToDomVariable_ = function(field, workspace) {
-  var potentialVariableMap = workspace.isFlyout ?
-      workspace.targetWorkspace.potentialVariableMap_ : null;
   // Ugh that's not true at all.
   var id = field.getValue();
   var variable = workspace.getVariableById(id);
-  if (!variable && potentialVariableMap) {
-    variable = potentialVariableMap.getVariableById(id);
+  if (!variable) {
+    if (workspace.isFlyout && workspace.targetWorkspace) {
+      var potentialVariableMap =
+          workspace.targetWorkspace.potentialVariableMap_;
+      if (potentialVariableMap) {
+        variable = potentialVariableMap.getVariableById(id);
+      }
+    }
   }
   if (variable) {
     var container = goog.dom.createDom('field', null, variable.name);