From 9377d12c07c79f9fc3d18a2681a6e84abc4a054d Mon Sep 17 00:00:00 2001 From: momo5502 Date: Tue, 14 Feb 2017 00:09:24 +0100 Subject: [PATCH] [Menus] Don't load the default menu upon failure --- src/Components/Modules/Menus.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Components/Modules/Menus.cpp b/src/Components/Modules/Menus.cpp index 1083226b..9ef79d3e 100644 --- a/src/Components/Modules/Menus.cpp +++ b/src/Components/Modules/Menus.cpp @@ -217,17 +217,17 @@ namespace Components if (menus.empty()) { - // Try loading the original menu, if we can't load our custom one - Game::menuDef_t* originalMenu = AssetHandler::FindOriginalAsset(Game::XAssetType::ASSET_TYPE_MENU, menudef->window.name).menu; - - if (originalMenu) - { - menus.push_back(originalMenu); - } - else - { +// // Try loading the original menu, if we can't load our custom one +// Game::menuDef_t* originalMenu = AssetHandler::FindOriginalAsset(Game::XAssetType::ASSET_TYPE_MENU, menudef->window.name).menu; +// +// if (originalMenu) +// { +// menus.push_back(originalMenu); +// } +// else +// { menus.push_back(menudef); - } +// } } return menus;