From d8a5f4bac98ed8cfa5976917f553d020a79a5f8b Mon Sep 17 00:00:00 2001
From: Exzap <13877693+Exzap@users.noreply.github.com>
Date: Mon, 13 Jul 2026 01:46:54 +0200
Subject: [PATCH] Latte: Smaller fixes

Fixes #1979
---
 src/Cafe/HW/Latte/Core/LatteShader.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Cafe/HW/Latte/Core/LatteShader.cpp b/src/Cafe/HW/Latte/Core/LatteShader.cpp
index d7891051..3041f63c 100644
--- a/src/Cafe/HW/Latte/Core/LatteShader.cpp
+++ b/src/Cafe/HW/Latte/Core/LatteShader.cpp
@@ -172,7 +172,7 @@ void LatteSHRC_RemoveFromCaches(LatteDecompilerShader* shader)
             cemu_assert_debug(shader->baseHash == shader->next->baseHash);
             cache.emplace(shader->baseHash, shader->next);
         }
-        shader->next = 0;
+        shader->next = nullptr;
 		removed = true;
 	}
 	else
@@ -187,6 +187,7 @@ void LatteSHRC_RemoveFromCaches(LatteDecompilerShader* shader)
 				removed = true;
 				break;
 			}
+			shaderChain = shaderChain->next;
 		}
 	}
 	cemu_assert(removed);
@@ -1256,7 +1257,7 @@ void LatteSHRC_UpdateActiveShaders()
 				_activeVertexShader = auxVariant.vertexShader;
 				_activePixelShader = auxVariant.pixelShader;
 				_activeGeometryShader = auxVariant.geometryShader;
-				LatteGPUState.activeShaderHasError = shaderStateInfo->shaderError;
+				LatteGPUState.activeShaderHasError = auxVariant.hasError;
 				return;
 			}
 		}