From deac9d0fcbfd7211781144ae1bf71916fd2c4a00 Mon Sep 17 00:00:00 2001
From: devZoGok <nenkokeko@yandex.com>
Date: Tue, 16 Jun 2026 20:12:10 +0300
Subject: [PATCH] bugfix for crashing when toggling pause

---
 map.cpp            | 5 +++--
 researchButton.cpp | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/map.cpp b/map.cpp
index 36447c0..4ba9728 100755
--- a/map.cpp
+++ b/map.cpp
@@ -212,9 +212,10 @@ namespace battleship{
 	}
 
 	void Map::Minimap::update(){
-		if(!GameManager::getSingleton()->getStateManager()->getAppStateByType(AppStateType::ACTIVE_STATE)) return;
-
 		Button *mb = ConcreteGuiManager::getSingleton()->getButton("minimap");
+
+		if(!(GameManager::getSingleton()->getStateManager()->getAppStateByType(AppStateType::ACTIVE_STATE) && mb)) return;
+
 		updateCamFrame(mb);
 	}
 
diff --git a/researchButton.cpp b/researchButton.cpp
index 21d1944..e461def 100644
--- a/researchButton.cpp
+++ b/researchButton.cpp
@@ -49,8 +49,10 @@ namespace battleship{
 
 	void ResearchButton::update(){
 		Button::update();
-
 		ActiveGameState *activeState = (ActiveGameState*)(GameManager::getSingleton()->getStateManager()->getAppStateByType((int)AppStateType::ACTIVE_STATE));
+
+		if(!activeState) return;
+
 		vector<int> technologies = activeState->getPlayer()->getTechnologies();
 		bool hasTech = (find(technologies.begin(), technologies.end(), techId) != technologies.end());