mail[Wesnoth-commits] r13761 - /trunk/src/game.cpp


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

Header


Content

Posted by edb on October 01, 2006 - 12:19:
Author: edb
Date: Sun Oct  1 12:18:45 2006
New Revision: 13761

URL: http://svn.gna.org/viewcvs/wesnoth?rev=13761&view=rev
Log:
fix https://gna.org/bugs/index.php?6291

Modified:
    trunk/src/game.cpp

Modified: trunk/src/game.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game.cpp?rev=13761&r1=13760&r2=13761&view=diff
==============================================================================
--- trunk/src/game.cpp (original)
+++ trunk/src/game.cpp Sun Oct  1 12:18:45 2006
@@ -156,7 +156,7 @@
 game_controller::game_controller(int argc, char** argv)
    : argc_(argc), arg_(1), argv_(argv), thread_manager(),
      test_mode_(false), multiplayer_mode_(false),
-     no_gui_(false), use_caching_(true), force_valid_cache_(false), 
+     no_gui_(false), use_caching_(true), force_valid_cache_(false),
      force_bpp_(-1), disp_(NULL), loaded_game_show_replay_(false)
 {
        for(arg_ = 1; arg_ != argc_; ++arg_) {
@@ -879,9 +879,11 @@
 
        try {
                const network::manager net_manager;
-               const network::connection sock = 
network::connect(items.front(),lexical_cast_default<int>(items.back(),15003));
+               const network::connection sock = 
gui::network_connect_dialog(disp(), _("Connecting to Server..."),
+                                                                             
  items.front(), lexical_cast_default<int>(items.back(),15003) );
                if(!sock) {
                        gui::show_error_message(disp(), _("Could not connect 
to host."));
+                       preferences::set_campaign_server("");
                        return;
                }
 
@@ -1883,7 +1885,7 @@
                std::cerr << "caught end_level_exception (quitting)\n";
        } catch(std::bad_alloc&) {
                std::cerr << "Ran out of memory. Aborted.\n";
-       } 
+       }
 
 #ifdef GP2X
        // We want this in gp2x so that users don't have to power-cycle




Related Messages


Powered by MHonArc, Updated Sun Oct 01 12:40:09 2006