From 7fa8742c2946bf13c3c07534a63483c57eab352b Mon Sep 17 00:00:00 2001 From: momo5502 Date: Sun, 22 Jan 2017 19:05:50 +0100 Subject: [PATCH] [Menus] Small fixes --- src/Components/Modules/Menus.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/Components/Modules/Menus.cpp b/src/Components/Modules/Menus.cpp index 1125a11f..c50070d8 100644 --- a/src/Components/Modules/Menus.cpp +++ b/src/Components/Modules/Menus.cpp @@ -28,6 +28,7 @@ namespace Components Game::script_t* Menus::LoadMenuScript(std::string name, std::string buffer) { Game::script_t* script = Game::Script_Alloc(sizeof(Game::script_t) + 1 + buffer.length()); + if (!script) return nullptr; strcpy_s(script->filename, sizeof(script->filename), name.data()); script->buffer = reinterpret_cast(script + 1); @@ -266,11 +267,7 @@ namespace Components for (int i = 0; i < menuList->menuCount; ++i) { - if (!menuList->menus[i]) - { - continue; - } - + if (!menuList->menus[i]) continue; Utils::Merge(&menus, Menus::LoadMenu(menuList->menus[i])); }