Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-02-25 16:41:04 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Don't crash if another dialog is added while finishing.

Browse Source
This commit is contained in:
Unknown W. Brackets 2013-09-15 18:06:07 -07:00
parent 86cff464b1
commit ef158f52ef
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ui/screen.cpp
View File

@ -162,12 +162,12 @@ void ScreenManager::RecreateAllViews() {
}
void ScreenManager::finishDialog(const Screen *dialog, DialogResult result) {
if (dialog != stack_.back().screen) {
ELOG("Wrong dialog being finished!");
if (stack_.empty()) {
ELOG("Must be in a dialog to finishDialog");
return;
}
if (!stack_.size()) {
ELOG("Must be in a dialog to finishDialog");
if (dialog != stack_.back().screen) {
ELOG("Wrong dialog being finished!");
return;
}
dialogFinished_ = dialog;
@ -176,15 +176,27 @@ void ScreenManager::finishDialog(const Screen *dialog, DialogResult result) {
void ScreenManager::processFinishDialog() {
if (dialogFinished_) {
if (stack_.size()) {
stack_.pop_back();
// Another dialog may have been pushed before the render, so search for it.
Screen *caller = 0;
for (size_t i = 0; i < stack_.size(); ++i) {
if (stack_[i].screen != dialogFinished_) {
continue;
}
stack_.erase(stack_.begin() + i);
// The previous screen was the caller (not necessarily the topmost.)
if (i > 0) {
caller = stack_[i - 1].screen;
}
}
Screen *caller = topScreen();
if (caller) {
caller->dialogFinished(dialogFinished_, dialogResult_);
} else {
if (!caller) {
ELOG("ERROR: no top screen when finishing dialog");
} else if (caller != topScreen()) {
// The caller may get confused if we call dialogFinished() now.
WLOG("Skipping non-top dialog when finishing dialog.");
} else {
caller->dialogFinished(dialogFinished_, dialogResult_);
}
delete dialogFinished_;
dialogFinished_ = 0;