[Wesnoth-cvs-commits] wesnoth/src game.cpp

[Philippe Plantier]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Philippe Plantier <address@hidden>      05/04/09 20:11:20

Modified files:
        src            : game.cpp 

Log message:
        Fixed the game crashing on an uncaught exception when loading a 
multiplayer
        save with invalid characters with the "load" titlescreen button.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game.cpp.diff?tr1=1.225&tr2=1.226&r1=text&r2=text

Patches:
Index: wesnoth/src/game.cpp
diff -u wesnoth/src/game.cpp:1.225 wesnoth/src/game.cpp:1.226
--- wesnoth/src/game.cpp:1.225  Sat Apr  9 09:46:12 2005
+++ wesnoth/src/game.cpp        Sat Apr  9 20:11:19 2005
@@ -1,4 +1,4 @@
-/* $Id: game.cpp,v 1.225 2005/04/09 09:46:12 gruikya Exp $ */
+/* $Id: game.cpp,v 1.226 2005/04/09 20:11:19 gruikya Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -789,8 +789,7 @@
        } catch(io_exception&) {
                gui::show_error_message(disp(), _("File I/O Error while reading 
the game"));
                return false;
-       }
-
+       } 
        recorder = replay(state_.replay_data);
        recorder.start_replay();
        recorder.set_skip(0);
@@ -856,6 +855,8 @@
                        //this will make it so next time through the title 
screen loop, this game is loaded
                        loaded_game_ = e.game;
                        loaded_game_show_replay_ = e.show_replay;
+               } catch(gamemap::incorrect_format_exception& e) {
+                       gui::show_error_message(disp(), std::string(_("The game 
map could not be loaded: ")) + e.msg_);
                }
 
                return false;