[Wesnoth-cvs-commits] wesnoth/src multiplayer_connect.cpp multiplayer...

[Philippe Plantier]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Philippe Plantier <address@hidden>      05/08/21 18:33:37

Modified files:
        src            : multiplayer_connect.cpp multiplayer_create.cpp 

Log message:
        Fixed #14236 : added a "wait" cursor when generating and loading maps

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_connect.cpp.diff?tr1=1.154&tr2=1.155&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_create.cpp.diff?tr1=1.33&tr2=1.34&r1=text&r2=text

Patches:
Index: wesnoth/src/multiplayer_connect.cpp
diff -u wesnoth/src/multiplayer_connect.cpp:1.154 
wesnoth/src/multiplayer_connect.cpp:1.155
--- wesnoth/src/multiplayer_connect.cpp:1.154   Mon Aug  1 23:00:54 2005
+++ wesnoth/src/multiplayer_connect.cpp Sun Aug 21 18:33:36 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_connect.cpp,v 1.154 2005/08/01 23:00:54 j_daniel Exp $ */
+/* $Id: multiplayer_connect.cpp,v 1.155 2005/08/21 18:33:36 gruikya Exp $ */
 /*
    Copyright (C)
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -881,7 +881,10 @@
                }
 
                std::string error_log;
-               ::load_game(game_data_, game, state_, &error_log);
+               {
+                       cursor::setter cur(cursor::WAIT);
+                       ::load_game(game_data_, game, state_, &error_log);
+               }
                if(!error_log.empty()) {
                        gui::show_error_message(disp(),
                                        _("The file you have tried to load is 
corrupt: '") +
Index: wesnoth/src/multiplayer_create.cpp
diff -u wesnoth/src/multiplayer_create.cpp:1.33 
wesnoth/src/multiplayer_create.cpp:1.34
--- wesnoth/src/multiplayer_create.cpp:1.33     Mon Aug  1 20:36:12 2005
+++ wesnoth/src/multiplayer_create.cpp  Sun Aug 21 18:33:37 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_create.cpp,v 1.33 2005/08/01 20:36:12 j_daniel Exp $ */
+/* $Id: multiplayer_create.cpp,v 1.34 2005/08/21 18:33:37 gruikya Exp $ */
 /*
    Copyright (C)
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -287,6 +287,7 @@
                const cursor::setter cursor_setter(cursor::WAIT);
 
                //generate the random map
+               cursor::setter cur(cursor::WAIT);
                parameters_.scenario_data = 
generator_->create_scenario(std::vector<std::string>());
                map_changed = true;