From e4de869db6b6df2840b3fa5bb3eb928767347105 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 6 Sep 2017 13:56:50 -0700
Subject: [PATCH] fix iterator find from merge

---
 assignment-client/src/assets/AssetServer.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/assignment-client/src/assets/AssetServer.cpp b/assignment-client/src/assets/AssetServer.cpp
index b2ebdaccc9..9e65ea3d96 100644
--- a/assignment-client/src/assets/AssetServer.cpp
+++ b/assignment-client/src/assets/AssetServer.cpp
@@ -1342,7 +1342,8 @@ bool AssetServer::setBakingEnabled(const AssetPathList& paths, bool enabled) {
 
             auto bakedMapping = getBakeMapping(hash, bakedFilename);
 
-            bool currentlyDisabled = (_fileMappings.value(bakedMapping) == hash);
+            auto it = _fileMappings.find(bakedMapping);
+            bool currentlyDisabled = (it != _fileMappings.end() && it->second == hash);
 
             if (enabled && currentlyDisabled) {
                 QStringList bakedMappings{ bakedMapping };