From 9a7fba284293e306ddeee314259cc82b49820e45 Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Fri, 7 Jun 2013 22:27:09 +0000 Subject: [PATCH] bugfix for custom about screen texture --- source/glest_game/menu/menu_state_about.cpp | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/source/glest_game/menu/menu_state_about.cpp b/source/glest_game/menu/menu_state_about.cpp index d4da78ae..63cb19d3 100644 --- a/source/glest_game/menu/menu_state_about.cpp +++ b/source/glest_game/menu/menu_state_about.cpp @@ -104,10 +104,6 @@ MenuStateAbout::MenuStateAbout(Program *program, MainMenu *mainMenu) : enableCustomModCredits = Config::getInstance().getBool("EnabledCustomModCredits","false"); if(enableCustomModCredits == true) { - string customModCreditsTextureFile = Config::getInstance().getString("CustomModCreditsTextureFile",""); - if(customModCreditsTextureFile != "") { - customModTexture = Renderer::findTexture(customModCreditsTextureFile); - } string customModCreditsText = Config::getInstance().getString("CustomModCreditsText",""); if(customModCreditsText != "") { replaceAll(customModCreditsText, "\\n", "\n"); @@ -133,14 +129,8 @@ MenuStateAbout::MenuStateAbout(Program *program, MainMenu *mainMenu) : MenuStateAbout::~MenuStateAbout() { if(customModTexture != NULL) { - - //customModTexture->end(); - //delete customModTexture; - //customModTexture = NULL; - if(customModTexture != NULL) { - Renderer::getInstance().endTexture(rsGlobal, customModTexture, false); - } - + Renderer::getInstance().endTexture(rsGlobal, customModTexture, false); + customModTexture = NULL; } } @@ -230,6 +220,13 @@ void MenuStateAbout::render() { Renderer &renderer= Renderer::getInstance(); if(enableCustomModCredits == true) { + if(customModTexture == NULL) { + string customModCreditsTextureFile = Config::getInstance().getString("CustomModCreditsTextureFile",""); + if(customModCreditsTextureFile != "") { + customModTexture = Renderer::findTexture(customModCreditsTextureFile); + } + } + renderer.renderBackground(customModTexture); renderer.renderLabel(&labelCustomModCredits); }