From c302efd315cdf3f64918a9c868ff94b367ceda2c Mon Sep 17 00:00:00 2001
From: Ivan Savenko <saven.ivan@gmail.com>
Date: Mon, 12 Dec 2022 00:04:46 +0200
Subject: [PATCH] Fix crash on accessing not yet created object

---
 client/gui/SDL_Extensions.h   | 2 +-
 client/mainmenu/CMainMenu.cpp | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/client/gui/SDL_Extensions.h b/client/gui/SDL_Extensions.h
index 1bb31e743..dee447645 100644
--- a/client/gui/SDL_Extensions.h
+++ b/client/gui/SDL_Extensions.h
@@ -186,7 +186,7 @@ public:
 			uint8_t(std::min(255.f, std::round(input.r * float(factor.r) / 255.f + added.r))),
 			uint8_t(std::min(255.f, std::round(input.g * float(factor.g) / 255.f + added.g))),
 			uint8_t(std::min(255.f, std::round(input.b * float(factor.b) / 255.f + added.b))),
-			uint8_t(std::min(255.f, std::round(input.a * float(factor.a) / 255.f + added.a))),
+			uint8_t(std::min(255.f, std::round(input.a * float(factor.a) / 255.f + added.a)))
 		};
 	}
 };
diff --git a/client/mainmenu/CMainMenu.cpp b/client/mainmenu/CMainMenu.cpp
index 2cab437c9..12f1b0639 100644
--- a/client/mainmenu/CMainMenu.cpp
+++ b/client/mainmenu/CMainMenu.cpp
@@ -369,10 +369,11 @@ CMultiMode::CMultiMode(ESelectionScreen ScreenType)
 	: screenType(ScreenType)
 {
 	OBJ_CONSTRUCTION_CAPTURING_ALL_NO_DISPOSE;
-	pos = background->center(); //center, window has size of bg graphic
 
 	background = std::make_shared<CPicture>("MUPOPUP.bmp");
-	picture    = std::make_shared<CPicture>("MUMAP.bmp", 16, 77);
+	pos = background->center(); //center, window has size of bg graphic
+
+	picture = std::make_shared<CPicture>("MUMAP.bmp", 16, 77);
 
 	statusBar = CGStatusBar::create(std::make_shared<CPicture>(background->getSurface(), Rect(7, 465, 440, 18), 7, 465));
 	playerName = std::make_shared<CTextInput>(Rect(19, 436, 334, 16), background->getSurface());