Fix obscure crash possibility (call stack found), some clarification

hrydgard · May 4, 2023 · 1bd7da2 · 1bd7da2
1 parent 9a2ca48
commit 1bd7da2
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp
@@ -1420,7 +1420,7 @@ void GameSettingsScreen::dialogFinished(const Screen *dialog, DialogResult resul
 }
 
 void GameSettingsScreen::RecreateViews() {
-	oldSettingInfo_ = settingInfo_->GetText();
+	oldSettingInfo_ = settingInfo_ ? settingInfo_->GetText() : "N/A";
 	UIScreen::RecreateViews();
 }
 

diff --git a/UI/MemStickScreen.h b/UI/MemStickScreen.h
@@ -74,8 +74,6 @@ class MemStickScreen : public UIDialogScreenWithBackground {
 	UI::EventReturn OnConfirmClick(UI::EventParams &params);
 	UI::EventReturn OnChoiceClick(UI::EventParams &params);
 
-	SettingInfoMessage *settingInfo_ = nullptr;
-
 	bool initialSetup_;
 	bool storageBrowserWorking_;
 	bool done_ = false;

diff --git a/UI/MiscScreens.cpp b/UI/MiscScreens.cpp
@@ -1114,5 +1114,5 @@ void SettingInfoMessage::Draw(UIContext &dc) {
 }
 
 std::string SettingInfoMessage::GetText() const {
-	return showing_ && text_ ? text_->GetText() : "";
+	return (showing_ && text_) ? text_->GetText() : "";
 }