From ff844204248d53b204456a4ec0d31168e949377a Mon Sep 17 00:00:00 2001
From: rogerman <rogerman@users.noreply.github.com>
Date: Tue, 23 Oct 2018 00:04:28 -0700
Subject: [PATCH] OpenGL Renderer: Improve robustness when changing the MSAA
 sample size.

---
 desmume/src/OGLRender.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/desmume/src/OGLRender.cpp b/desmume/src/OGLRender.cpp
index d7da0061f..fe7b8c356 100755
--- a/desmume/src/OGLRender.cpp
+++ b/desmume/src/OGLRender.cpp
@@ -1956,8 +1956,15 @@ Render3DError OpenGLRenderer::ApplyRenderingSettings(const GFX3D_State &renderSt
 	
 	if (this->_selectedMultisampleSize != oldSelectedMultisampleSize)
 	{
+		if (!BEGINGL())
+		{
+			return OGLERROR_BEGINGL_FAILED;
+		}
+		
 		GLsizei sampleSize = this->GetLimitedMultisampleSize();
 		this->ResizeMultisampledFBOs(sampleSize);
+		
+		ENDGL();
 	}
 	
 	return Render3D::ApplyRenderingSettings(renderState);