Merge pull request #3791 from unknownbrackets/ui-tweaks

Fix a crash when holding down escape in game

UI/MainScreen.cpp

@@ -691,8 +691,10 @@ void GamePauseScreen::DrawBackground(UIContext &dc) {
 }
 
 GamePauseScreen::~GamePauseScreen() {
-	g_Config.iCurrentStateSlot = saveSlots_->GetSelection();
-	g_Config.Save();
+	if (saveSlots_ != NULL) {
+		g_Config.iCurrentStateSlot = saveSlots_->GetSelection();
+		g_Config.Save();
+	}
 }
 
 void GamePauseScreen::CreateViews() {

UI/MainScreen.h

@@ -54,7 +54,7 @@ private:
 
 class GamePauseScreen : public UIScreen {
 public:
-	GamePauseScreen(const std::string &filename) : UIScreen(), gamePath_(filename) {}
+	GamePauseScreen(const std::string &filename) : UIScreen(), gamePath_(filename), saveSlots_(NULL) {}
 	~GamePauseScreen();
 	virtual void key(const KeyInput &key);