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

[ott]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     ott <address@hidden>    05/08/11 14:41:12

Modified files:
        src            : game.cpp 

Log message:
        tidy up campaign download fix

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

Patches:
Index: wesnoth/src/game.cpp
diff -u wesnoth/src/game.cpp:1.271 wesnoth/src/game.cpp:1.272
--- wesnoth/src/game.cpp:1.271  Wed Aug 10 19:51:51 2005
+++ wesnoth/src/game.cpp        Thu Aug 11 14:41:11 2005
@@ -1,4 +1,4 @@
-/* $Id: game.cpp,v 1.271 2005/08/10 19:51:51 ott Exp $ */
+/* $Id: game.cpp,v 1.272 2005/08/11 14:41:11 ott Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -755,14 +755,13 @@
        std::vector<gui::preview_pane*> preview_panes;
        preview_panes.push_back(&campaign_preview);
 
-       if(campaign_names.size() > 0) {
-               res = gui::show_dialog(disp(),NULL,_("Campaign"),
-                               _("Choose the campaign you want to play:"),
-                               gui::OK_CANCEL,&campaign_names,&preview_panes);
+       wassert(campaign_names.size() > 0);
+       res = gui::show_dialog(disp(),NULL,_("Campaign"),
+                       _("Choose the campaign you want to play:"),
+                       gui::OK_CANCEL,&campaign_names,&preview_panes);
 
-               if(res == -1) {
-                       return false;
-               }
+       if(res == -1) {
+               return false;
        }
 
        //get more campaigns from server