From 03ac79caba94cb34d5534d12ab43e8e6ffbb3f17 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Thu, 23 Nov 2017 09:08:39 -0800 Subject: [PATCH] UI: Minor pause screen cleanup. --- UI/PauseScreen.cpp | 4 ++-- UI/PauseScreen.h | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/UI/PauseScreen.cpp b/UI/PauseScreen.cpp index 5e45f1e5eb..bcb131eb9b 100644 --- a/UI/PauseScreen.cpp +++ b/UI/PauseScreen.cpp @@ -172,8 +172,8 @@ private: UI::EventReturn OnSaveState(UI::EventParams &e); UI::EventReturn OnLoadState(UI::EventParams &e); - UI::Button *saveStateButton_; - UI::Button *loadStateButton_; + UI::Button *saveStateButton_ = nullptr; + UI::Button *loadStateButton_ = nullptr; int slot_; std::string gamePath_; diff --git a/UI/PauseScreen.h b/UI/PauseScreen.h index 44c52f6d45..de6b615562 100644 --- a/UI/PauseScreen.h +++ b/UI/PauseScreen.h @@ -27,7 +27,7 @@ class GamePauseScreen : public UIDialogScreenWithGameBackground { public: - GamePauseScreen(const std::string &filename) : UIDialogScreenWithGameBackground(filename), finishNextFrame_(false), gamePath_(filename) {} + GamePauseScreen(const std::string &filename) : UIDialogScreenWithGameBackground(filename), gamePath_(filename) {} virtual ~GamePauseScreen(); virtual void dialogFinished(const Screen *dialog, DialogResult dr) override; @@ -39,7 +39,6 @@ protected: void CallbackDeleteConfig(bool yes); private: - UI::EventReturn OnMainSettings(UI::EventParams &e); UI::EventReturn OnGameSettings(UI::EventParams &e); UI::EventReturn OnExitToMenu(UI::EventParams &e); UI::EventReturn OnReportFeedback(UI::EventParams &e); @@ -55,11 +54,8 @@ private: UI::EventReturn OnSwitchUMD(UI::EventParams &e); UI::EventReturn OnState(UI::EventParams &e); - UI::Choice *saveStateButton_; - UI::Choice *loadStateButton_; - // hack - bool finishNextFrame_; + bool finishNextFrame_ = false; std::string gamePath_; };