fixed problem where after being disconnected from the server, ...
...players would be unable to reconnect without quitting the client
This commit is contained in:
parent
f52e2e0df2
commit
1ea1233dd7
3 changed files with 5 additions and 4 deletions
|
@ -509,7 +509,9 @@ int play_game(int argc, char** argv)
|
|||
return 0;
|
||||
} catch(network::error& e) {
|
||||
std::cerr << "caught network error...\n";
|
||||
gui::show_dialog(disp,NULL,"",e.message,gui::OK_ONLY);
|
||||
if(e.message != "") {
|
||||
gui::show_dialog(disp,NULL,"",e.message,gui::OK_ONLY);
|
||||
}
|
||||
} catch(gamemap::incorrect_format_exception& e) {
|
||||
gui::show_dialog(disp,NULL,"",std::string("The game map could not be loaded: ") + e.msg_,gui::OK_ONLY);
|
||||
std::cerr << "The game map could not be loaded: " << e.msg_ << "\n";
|
||||
|
|
|
@ -82,7 +82,7 @@ std::pair<int,int> current_transfer_stats();
|
|||
|
||||
struct error
|
||||
{
|
||||
error(const std::string& msg, connection sock=0);
|
||||
error(const std::string& msg="", connection sock=0);
|
||||
std::string message;
|
||||
connection socket;
|
||||
|
||||
|
|
|
@ -605,8 +605,7 @@ redo_turn:
|
|||
map,teams,player_number,units,true);
|
||||
|
||||
turn_data.save_game(string_table["save_game_error"]);
|
||||
|
||||
return QUIT;
|
||||
throw network::error();
|
||||
}
|
||||
|
||||
} //end for(;;)
|
||||
|
|
Loading…
Add table
Reference in a new issue