UI: Minor pause screen cleanup.

hrydgard · Nov 23, 2017 · 03ac79c · 03ac79c
1 parent 3431653
commit 03ac79c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/UI/PauseScreen.cpp b/UI/PauseScreen.cpp
@@ -172,8 +172,8 @@ class SaveSlotView : public UI::LinearLayout {
 	UI::EventReturn OnSaveState(UI::EventParams &e);
 	UI::EventReturn OnLoadState(UI::EventParams &e);
 
-	UI::Button *saveStateButton_;
+	UI::Button *saveStateButton_ = nullptr;
-	UI::Button *loadStateButton_;
+	UI::Button *loadStateButton_ = nullptr;
 
 	int slot_;
 	std::string gamePath_;

diff --git 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 @@ class GamePauseScreen : public UIDialogScreenWithGameBackground {
 	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 @@ class GamePauseScreen : public UIDialogScreenWithGameBackground {
 	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_;
 };