From f50dadb2842b878a9139bdf18df39e929dba19dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Sun, 26 Nov 2017 21:02:33 +0100
Subject: [PATCH] Fix the fix for Thrillville. See #7459

---
 GPU/GPUCommon.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/GPU/GPUCommon.cpp b/GPU/GPUCommon.cpp
index 23ae269e0d52..fa4fdc38990a 100644
--- a/GPU/GPUCommon.cpp
+++ b/GPU/GPUCommon.cpp
@@ -1842,6 +1842,8 @@ void GPUCommon::Execute_ImmVertexAlphaPrim(u32 op, u32 diff) {
 		// Instead of finding a proper point to flush, we just emit a full rectangle every time one
 		// is finished.
 		FlushImm();
+		// Need to reset immCount_ here. If we do it in FlushImm it could get skipped by gstate_c.skipDrawReason.
+		immCount_ = 0;
 	} else {
 		ERROR_LOG_REPORT_ONCE(imm_draw_prim, G3D, "Immediate draw: Unexpected primitive %d at count %d", prim, immCount_);
 	}
@@ -1878,7 +1880,6 @@ void GPUCommon::FlushImm() {
 	drawEngineCommon_->DispatchFlush();
 	// TOOD: In the future, make a special path for these.
 	// drawEngineCommon_->DispatchSubmitImm(immBuffer_, immCount_);
-	immCount_ = 0;
 }
 
 void GPUCommon::ExecuteOp(u32 op, u32 diff) {