0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

attempt to fix server crash

Browse source
This commit is contained in:
uid68803 2004-01-13 05:26:31 +00:00
parent cc7eea96e3
commit 028b742395
3 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/config.cpp
View file

@ -692,7 +692,7 @@ void config::clear_children(const std::string& key)
children.erase(key);
}
void config::remove_child(const std::string& key, size_t index)
config* config::remove_child(const std::string& key, size_t index)
{
//remove from the ordering
const child_pos pos(children.find(key),index);
@ -709,7 +709,9 @@ void config::remove_child(const std::string& key, size_t index)
//remove from the child map
child_list& v = children[key];
assert(index < v.size());
config* const res = v[index];
v.erase(v.begin()+index);
return res;
}
std::string& config::operator[](const std::string& key)

2
src/config.hpp
View file

@ -120,7 +120,7 @@ struct config
const std::string& value) const;
void clear_children(const std::string& key);
void remove_child(const std::string& key, size_t index);
config* remove_child(const std::string& key, size_t index);
static std::vector<std::string> split(const std::string& val, char c=',');
static std::string& strip(std::string& str);

6
src/server/server.cpp
View file

@ -66,9 +66,6 @@ void server::run()
config data;
while((sock = network::receive_data(data)) != NULL) {
std::cerr << "from " << (int)sock << " received: "
<< data.write() << "\n-----\n";
//if someone who is not yet logged in is sending
//login details
if(not_logged_in_.is_member(sock)) {
@ -247,8 +244,7 @@ void server::run()
const config::child_iterator desc = std::find(vg.first,vg.second,g->description());
if(desc != vg.second) {
gamelist->remove_child("game",desc - vg.first);
delete *desc;
delete gamelist->remove_child("game",desc - vg.first);
}
//put the players back in the lobby and send