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

[Jon Daniel]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Jon Daniel <address@hidden>     05/08/02 21:07:15

Modified files:
        src            : multiplayer_wait.cpp 

Log message:
        Fixed bug #9376

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

Patches:
Index: wesnoth/src/multiplayer_wait.cpp
diff -u wesnoth/src/multiplayer_wait.cpp:1.30 
wesnoth/src/multiplayer_wait.cpp:1.31
--- wesnoth/src/multiplayer_wait.cpp:1.30       Mon Aug  1 23:00:54 2005
+++ wesnoth/src/multiplayer_wait.cpp    Tue Aug  2 21:07:15 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_wait.cpp,v 1.30 2005/08/01 23:00:54 j_daniel Exp $ */
+/* $Id: multiplayer_wait.cpp,v 1.31 2005/08/02 21:07:15 j_daniel Exp $ */
 /*
    Copyright (C)
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -226,9 +226,13 @@
                                        possible_sides);
                        preview_panes.push_back(&leader_selector);
 
-                       faction_choice = size_t(gui::show_dialog(disp(), NULL, 
"",
-                                               _("Choose your side:"),
-                                               gui::OK_ONLY, &choices, 
&preview_panes));
+                       const int res = gui::show_dialog(disp(), NULL, "", 
_("Choose your side:"),
+                                               gui::OK_CANCEL, &choices, 
&preview_panes);
+                       if(res < 0) {
+                               set_result(QUIT);
+                               return;
+                       }
+                       faction_choice = res;
                        leader_choice = leader_selector.get_selected_leader();
 
                        wassert(faction_choice < possible_sides.size());