upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-03 01:35:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make showing a dialog exception safe.

Browse Source
This commit is contained in:
Mark de Wever 2009-10-10 11:11:57 +00:00
parent 068103c765
commit f961dd6bbc
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/gui/widgets/window.cpp
View File

@ -460,17 +460,34 @@ int twindow::show(const bool restore, const unsigned auto_close_timeout)
delay_event(event, auto_close_timeout);
}
// Start our loop drawing will happen here as well.
for(status_ = SHOWING; status_ != REQUEST_CLOSE; ) {
// process installed callback if valid, to allow e.g. network polling
// @todo use a cleaner way of getting external events
if (event_loop_pre_cb_) {
event_loop_pre_cb_();
try {
// Start our loop drawing will happen here as well.
for(status_ = SHOWING; status_ != REQUEST_CLOSE; ) {
// process installed callback if valid, to allow e.g. network polling
// @todo use a cleaner way of getting external events
if (event_loop_pre_cb_) {
event_loop_pre_cb_();
}
events::pump();
// Add a delay so we don't keep spinning if there's no event.
SDL_Delay(10);
}
events::pump();
// Add a delay so we don't keep spinning if there's no event.
SDL_Delay(10);
} catch(...) {
/**
* @todo Clean up the code duplication.
*
* In the future the restoring shouldn't be needed so the duplication
* doesn't hurt too much but keep this todo as a reminder.
*/
suspend_drawing_ = true;
// restore area
if(restore) {
SDL_Rect rect = get_rect();
SDL_BlitSurface(restorer_, 0, video_.getSurface(), &rect);
update_rect(get_rect());
}
throw;
}
suspend_drawing_ = true;