From 54ad3433b1880291a02b9d71a16e99ee46dec2dd Mon Sep 17 00:00:00 2001
From: Emile Belanger <emile.belanger@gmail.com>
Date: Sun, 21 Nov 2021 12:01:42 +0000
Subject: [PATCH] GLES: Load default shader if we try to load user shader to
 avoid crash

---
 src/common/rendering/gles/gles_shader.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/common/rendering/gles/gles_shader.h b/src/common/rendering/gles/gles_shader.h
index 66fcb1ebd..b9c98fb6e 100644
--- a/src/common/rendering/gles/gles_shader.h
+++ b/src/common/rendering/gles/gles_shader.h
@@ -480,7 +480,10 @@ public:
 		{
 			return mMaterialShaders[eff];
 		}
-		return NULL;
+		else // This can happen if we try and active a user shader which is not loaded, so return default shader so it does not crash
+		{
+			return mMaterialShaders[0];
+		}
 	}
 };