Fix ordering problem with screenshots that was causing crashes.

Fixes #17781
This commit is contained in:
Henrik Rydgård committed 2023-08-23 19:03:33 +02:00
1 parent 18b0f3be5d
commit 797f88bf31
4 files changed
+19 -16

No files matched your search

+8 -5
View File
@@ -178,12 +178,13 @@ void ScreenManager::render() {
iter++;
}
stack_.back().screen->render();
if (postRenderCb_) {
postRenderCb_(getUIContext(), postRenderUserdata_);
}
if (overlayScreen_) {
overlayScreen_->render();
}
if (postRenderCb_) {
// Really can't render anything after this! Will crash the screenshot mechanism if we do.
postRenderCb_(getUIContext(), postRenderUserdata_);
}
first->screen->postRender();
break;
}
@@ -191,11 +192,13 @@ void ScreenManager::render() {
_assert_(stack_.back().screen);
stack_.back().screen->preRender();
stack_.back().screen->render();
if (postRenderCb_)
postRenderCb_(getUIContext(), postRenderUserdata_);
if (overlayScreen_) {
overlayScreen_->render();
}
if (postRenderCb_) {
// Really can't render anything after this! Will crash the screenshot mechanism if we do.
postRenderCb_(getUIContext(), postRenderUserdata_);
}
stack_.back().screen->postRender();
break;
}