From 527a372bd308e91b480826a428730f83ca396593 Mon Sep 17 00:00:00 2001
From: Jonas Kulla <Nyocurio@gmail.com>
Date: Wed, 9 Jul 2014 02:47:32 +0200
Subject: [PATCH] Window: Fix contents not being drawn if no windowskin is set

---
 src/window.cpp | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/window.cpp b/src/window.cpp
index 47f9e92..3cc952d 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -577,7 +577,7 @@ struct WindowPrivate
 
 	void drawControls()
 	{
-		if (!windowskin)
+		if (!windowskin && !contents)
 			return;
 
 		if (size == Vec2i(0, 0))
@@ -604,15 +604,19 @@ struct WindowPrivate
 		SimpleAlphaShader &shader = shState->shaders().simpleAlpha;
 		shader.bind();
 		shader.applyViewportProj();
-		shader.setTranslation(Vec2i(effectX, effectY));
 
-		/* Draw arrows / cursors */
-		windowskin->bindTex(shader);
-		TEX::setSmooth(true);
+		if (windowskin)
+		{
+			shader.setTranslation(Vec2i(effectX, effectY));
 
-		controlsQuadArray.draw(0, controlsQuadCount);
+			/* Draw arrows / cursors */
+			windowskin->bindTex(shader);
+			TEX::setSmooth(true);
 
-		TEX::setSmooth(false);
+			controlsQuadArray.draw(0, controlsQuadCount);
+
+			TEX::setSmooth(false);
+		}
 
 		if (contents)
 		{