From aa9da9012eb273c0208b2c560c00276cc0597cb7 Mon Sep 17 00:00:00 2001 From: momo5502 Date: Sun, 13 Nov 2016 20:53:27 +0100 Subject: [PATCH] [Menus] Small fix for unloaded menus --- src/Components/Modules/Menus.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Components/Modules/Menus.cpp b/src/Components/Modules/Menus.cpp index 636474d3..01a6473e 100644 --- a/src/Components/Modules/Menus.cpp +++ b/src/Components/Modules/Menus.cpp @@ -531,7 +531,7 @@ namespace Components Menus::RemoveMenuList(filename); } - if (menuList) + if (menuList && reinterpret_cast(menuList) != 0xDDDDDDDD) { // Parse scriptmenus! if (menuList->menus[0]->window.name == "default_menu"s || Utils::String::EndsWith(filename, ".menu")) @@ -552,6 +552,10 @@ namespace Components header.menuList = Menus::LoadMenuList(menuList); } } + else + { + header.menuList = nullptr; + } return header; }