From 2e53bf914ef22a85eb3357450381da30b8ef10fb Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Fri, 30 Oct 2020 20:44:21 +1000
Subject: [PATCH] CPU/CodeCache: Fix crash when jumping to invalid block in
 recompiler

---
 src/core/cpu_code_cache.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/core/cpu_code_cache.cpp b/src/core/cpu_code_cache.cpp
index 7f311cc9d..6f1091e55 100644
--- a/src/core/cpu_code_cache.cpp
+++ b/src/core/cpu_code_cache.cpp
@@ -400,6 +400,7 @@ CodeBlock* LookupBlock(CodeBlockKey key)
 
 #ifdef WITH_RECOMPILER
     SetFastMap(block->GetPC(), block->host_code);
+    AddBlockToHostCodeMap(block);
 #endif
   }
   else
@@ -409,9 +410,7 @@ CodeBlock* LookupBlock(CodeBlockKey key)
     block = nullptr;
   }
 
-  iter = s_blocks.emplace(key.bits, block).first;
-  AddBlockToHostCodeMap(block);
-
+  s_blocks.emplace(key.bits, block);
   return block;
 }