0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix segfault in loadingscreen when staring campaigns,

Browse source
This commit is contained in:
gfgtdf 2016-03-30 21:08:31 +02:00
parent 2b565b9abe
commit 249792e08d
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/game_display.cpp
View file

@ -74,8 +74,8 @@ game_display::game_display(game_board& board, CVideo& video, boost::weak_ptr<wb:
const tod_manager& tod,
const config& theme_cfg,
const config& level,
bool dummy) :
display(&board, video, wb, reports_object, theme_cfg, level, !dummy),
bool) :
display(&board, video, wb, reports_object, theme_cfg, level, false),
overlay_map_(),
attack_indicator_src_(),
attack_indicator_dst_(),

6
src/play_controller.cpp
View file

@ -257,10 +257,6 @@ void play_controller::init(CVideo& video, const config& level)
LOG_NG << "building terrain rules... " << (SDL_GetTicks() - ticks()) << std::endl;
gui2::tloadscreen::progress("build terrain");
//NOTE: since the loading now happens in a sperate thread creating the game_display object here is dangerous.
// for example becasue it might registers an sdl_handler while the main thread is calling events::pump
//TODO: Find a way to move the sdl_handler::join() calls out of here.
gui_.reset(new game_display(gamestate().board_, video, whiteboard_manager_, *gamestate().reports_, gamestate().tod_manager_, theme_cfg, level));
if (!gui_->video().faked()) {
if (saved_game_.mp_settings().mp_countdown)
@ -313,6 +309,8 @@ void play_controller::init(CVideo& video, const config& level)
plugins_context_->set_callback("save_replay", boost::bind(&play_controller::save_replay_auto, this, boost::bind(get_str, _1, "filename" )), true);
plugins_context_->set_callback("quit", throw_end_level(), false);
});
//Do this after the loadingscreen, so that ita happens in the main thread.
gui_->join();
}
void play_controller::reset_gamestate(const config& level, int replay_pos)