From a4b23d80b71be1c6c1da79b4c1ce9116d545c48e Mon Sep 17 00:00:00 2001
From: Fiora <fioraaeterna@gmail.com>
Date: Thu, 14 Aug 2014 09:31:35 -0700
Subject: [PATCH] JIT: correctly set skipNext even if conditional-continue is
 off

Part 2: I missed the other branch-merging case in the first commit.
---
 Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp
index 0568b29a43..346f1e5c18 100644
--- a/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp
+++ b/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp
@@ -338,6 +338,7 @@ void Jit64::cmpXX(UGeckoInstruction inst)
 		if (merge_branch)
 		{
 			js.downcountAmount++;
+			js.skipnext = true;
 
 			gpr.Flush();
 			fpr.Flush();
@@ -382,7 +383,6 @@ void Jit64::cmpXX(UGeckoInstruction inst)
 			{
 				if (!analyzer.HasOption(PPCAnalyst::PPCAnalyzer::OPTION_CONDITIONAL_CONTINUE))
 				{
-					js.skipnext = true;
 					WriteExit(js.next_compilerPC + 4);
 				}
 			}