Fixed|Client: Cleanup after refactoring

Drawing the view border may now be attempted earlier than before.
skyjake · Oct 9, 2016 · eb8c869 · eb8c869
1 parent f91b2b4
commit eb8c869
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/doomsday/apps/client/src/render/r_draw.cpp b/doomsday/apps/client/src/render/r_draw.cpp
@@ -217,8 +217,9 @@ void R_DrawViewBorder()
     viewdata_t const *vd = &DD_Player(displayPlayer)->viewport();
     DENG2_ASSERT(port != 0 && vd != 0);
 
-    if(vd->window.isNull()) return;
-    if(vd->window.size() >= port->geometry.size()) return;
+    if (!borderGraphicsNames[BG_BACKGROUND]) return;
+    if (vd->window.isNull()) return;
+    if (vd->window.size() >= port->geometry.size()) return;
 
     DENG_ASSERT_IN_MAIN_THREAD();
     DENG_ASSERT_GL_CONTEXT_ACTIVE();

diff --git a/doomsday/apps/client/src/resource/bitmapfont.cpp b/doomsday/apps/client/src/resource/bitmapfont.cpp
@@ -348,7 +348,7 @@ void BitmapFont::glDeinit()
 
     if(d->texGLName)
     {
-        LIBGUI_GL.glDeleteTextures(1, (GLuint const *) &d->texGLName);
+        Deferred_glDeleteTextures(1, (GLuint const *) &d->texGLName);
     }
     d->texGLName = 0;
 }