2 files changed, 9 insertions, 2 deletions

diff --git a/minuitwrp/graphics.c b/minuitwrp/graphics.c
index 7160c7e2e..cd3c8f497 100644
--- a/minuitwrp/graphics.c
+++ b/minuitwrp/graphics.c
@@ -466,6 +466,8 @@ int gr_textEx(int x, int y, const char *s, void* pFont)
         }
     }
 
+    gl->disable(gl, GGL_TEXTURE_2D);
+
     return x;
 }
 
@@ -508,6 +510,8 @@ int gr_textExW(int x, int y, const char *s, void* pFont, int max_width)
         }
     }
 
+    gl->disable(gl, GGL_TEXTURE_2D);
+
     return x;
 }
 
@@ -555,6 +559,8 @@ int gr_textExWH(int x, int y, const char *s, void* pFont, int max_width, int max
         }
     }
 
+    gl->disable(gl, GGL_TEXTURE_2D);
+
     return x;
 }
 
@@ -579,7 +585,6 @@ void gr_fill(int x, int y, int w, int h)
     if(gr_is_curr_clr_opaque)
         gl->disable(gl, GGL_BLEND);
 
-    gl->disable(gl, GGL_TEXTURE_2D);
     gl->recti(gl, x, y, x + w, y + h);
 
     if(gr_is_curr_clr_opaque)
@@ -604,6 +609,7 @@ void gr_blit(gr_surface source, int sx, int sy, int w, int h, int dx, int dy) {
     gl->enable(gl, GGL_TEXTURE_2D);
     gl->texCoord2i(gl, sx - dx, sy - dy);
     gl->recti(gl, dx, dy, dx + w, dy + h);
+    gl->disable(gl, GGL_TEXTURE_2D);
 
     if(surface->format == GGL_PIXEL_FORMAT_RGBX_8888)
         gl->enable(gl, GGL_BLEND);
diff --git a/minuitwrp/truetype.c b/minuitwrp/truetype.c
index 998ab45dd..db70236a4 100644
--- a/minuitwrp/truetype.c
+++ b/minuitwrp/truetype.c
@@ -663,10 +663,11 @@ int gr_ttf_textExWH(void *context, int x, int y, const char *s, void *pFont, int
     gl->texEnvi(gl, GGL_TEXTURE_ENV, GGL_TEXTURE_ENV_MODE, GGL_REPLACE);
     gl->texGeni(gl, GGL_S, GGL_TEXTURE_GEN_MODE, GGL_ONE_TO_ONE);
     gl->texGeni(gl, GGL_T, GGL_TEXTURE_GEN_MODE, GGL_ONE_TO_ONE);
-    gl->enable(gl, GGL_TEXTURE_2D);
 
+    gl->enable(gl, GGL_TEXTURE_2D);
     gl->texCoord2i(gl, -x, -y);
     gl->recti(gl, x, y, x + e->surface.width, y_bottom);
+    gl->disable(gl, GGL_TEXTURE_2D);
 
     pthread_mutex_unlock(&font->mutex);
     return res;