mail[Wesnoth-commits] r43598 - in /trunk/src: play_controller.cpp play_controller.hpp


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by gabrielmorin on June 19, 2010 - 23:38:
Author: gabba
Date: Sat Jun 19 23:38:23 2010
New Revision: 43598

URL: http://svn.gna.org/viewcvs/wesnoth?rev=43598&view=rev
Log:
Change initialization order of whiteboard to prevent crash on exit

Modified:
    trunk/src/play_controller.cpp
    trunk/src/play_controller.hpp

Modified: trunk/src/play_controller.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/play_controller.cpp?rev=43598&r1=43597&r2=43598&view=diff
==============================================================================
--- trunk/src/play_controller.cpp (original)
+++ trunk/src/play_controller.cpp Sat Jun 19 23:38:23 2010
@@ -79,7 +79,6 @@
        menu_handler_(NULL, units_, teams_, level, map_, game_config, 
tod_manager_, state_of_game),
        soundsources_manager_(),
        tod_manager_(level, num_turns, &state_of_game),
-       whiteboard_manager_(),
        gui_(),
        statistics_context_(level["name"]),
        level_(level),
@@ -89,6 +88,7 @@
        units_(),
        undo_stack_(),
        redo_stack_(),
+       whiteboard_manager_(),
        xp_mod_(level["experience_modifier"].to_int(100)),
        loading_game_(level["playing_team"].empty() == false),
        first_human_team_(-1),

Modified: trunk/src/play_controller.hpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/play_controller.hpp?rev=43598&r1=43597&r2=43598&view=diff
==============================================================================
--- trunk/src/play_controller.hpp (original)
+++ trunk/src/play_controller.hpp Sat Jun 19 23:38:23 2010
@@ -203,7 +203,6 @@
        events::menu_handler menu_handler_;
        boost::scoped_ptr<soundsource::manager> soundsources_manager_;
        tod_manager tod_manager_;
-       boost::scoped_ptr<wb::manager> whiteboard_manager_;
 
        //other objects
        boost::scoped_ptr<game_display> gui_;
@@ -216,6 +215,9 @@
        undo_list undo_stack_;
        undo_list redo_stack_;
 
+       //whiteboard manager
+       boost::scoped_ptr<wb::manager> whiteboard_manager_;
+
        const unit_type::experience_accelerator xp_mod_;
        //if a team is specified whose turn it is, it means we're loading a 
game
        //instead of starting a fresh one. Gets reset to false after init_side




Related Messages


Powered by MHonArc, Updated Sat Jun 19 23:40:16 2010