diff --git a/source/glest_game/menu/menu_state_connected_game.cpp b/source/glest_game/menu/menu_state_connected_game.cpp index da88bf2e9..ed8f914a0 100644 --- a/source/glest_game/menu/menu_state_connected_game.cpp +++ b/source/glest_game/menu/menu_state_connected_game.cpp @@ -797,16 +797,18 @@ void MenuStateConnectedGame::update() { } } - if( clientInterface != NULL && clientInterface->isConnected() && - gameSettings != NULL) { + if(enableFactionTexturePreview == true) { + if( clientInterface != NULL && clientInterface->isConnected() && + gameSettings != NULL) { - string factionLogo = Game::findFactionLogoFile(gameSettings, NULL,"preview_screen.*"); - if(factionLogo == "") { - factionLogo = Game::findFactionLogoFile(gameSettings, NULL); - } - if(currentFactionLogo != factionLogo) { - currentFactionLogo = factionLogo; - loadFactionTexture(currentFactionLogo); + string factionLogo = Game::findFactionLogoFile(gameSettings, NULL,"preview_screen.*"); + if(factionLogo == "") { + factionLogo = Game::findFactionLogoFile(gameSettings, NULL); + } + if(currentFactionLogo != factionLogo) { + currentFactionLogo = factionLogo; + loadFactionTexture(currentFactionLogo); + } } } } diff --git a/source/glest_game/menu/menu_state_custom_game.cpp b/source/glest_game/menu/menu_state_custom_game.cpp index c7f956d2d..c2e4b98ab 100644 --- a/source/glest_game/menu/menu_state_custom_game.cpp +++ b/source/glest_game/menu/menu_state_custom_game.cpp @@ -1304,13 +1304,15 @@ void MenuStateCustomGame::update() { } soundConnectionCount = currentConnectionCount; - string factionLogo = Game::findFactionLogoFile(&gameSettings, NULL,"preview_screen.*"); - if(factionLogo == "") { - factionLogo = Game::findFactionLogoFile(&gameSettings, NULL); - } - if(currentFactionLogo != factionLogo) { - currentFactionLogo = factionLogo; - loadFactionTexture(currentFactionLogo); + if(enableFactionTexturePreview == true) { + string factionLogo = Game::findFactionLogoFile(&gameSettings, NULL,"preview_screen.*"); + if(factionLogo == "") { + factionLogo = Game::findFactionLogoFile(&gameSettings, NULL); + } + if(currentFactionLogo != factionLogo) { + currentFactionLogo = factionLogo; + loadFactionTexture(currentFactionLogo); + } } //SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line %d]\n",__FILE__,__FUNCTION__,__LINE__);