#5420: Fix crash at startup when the "load last map" setting is active

codereader · Nov 18, 2020 · 899573a · 899573a
1 parent 57dec3e
commit 899573a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/include/version.h b/include/version.h
@@ -2,7 +2,7 @@
 #include <config.h>
 #define RADIANT_VERSION PACKAGE_VERSION
 #else
-#define RADIANT_VERSION "2.9.0"
+#define RADIANT_VERSION "2.9.1"
 #endif
 
 #define RADIANT_APPNAME "DarkRadiant"

diff --git a/radiant/render/OpenGLModule.cpp b/radiant/render/OpenGLModule.cpp
@@ -38,7 +38,7 @@ void OpenGLModule::drawChar(char character) const
 
 int OpenGLModule::getFontHeight() 
 {
-	return _font->getPixelHeight();
+	return _font ? _font->getPixelHeight() : 0;
 }
 
 const std::string& OpenGLModule::getName() const

diff --git a/radiant/ui/texturebrowser/TextureBrowser.cpp b/radiant/ui/texturebrowser/TextureBrowser.cpp
@@ -602,13 +602,17 @@ void TextureBrowser::queueUpdate()
 
 void TextureBrowser::performUpdate()
 {
+    // During startup the openGL module might not have created the font yet
+    if (!GlobalMaterialManager().isRealised() || GlobalOpenGL().getFontHeight() == 0)
+    {
+        return;
+    }
+
     _updateNeeded = false;
 
     // Update all renderable items
     _tiles.clear();
 
-    if (!GlobalMaterialManager().isRealised()) return;
-
     CurrentPosition layout;
     _entireSpaceHeight = 0;