Merge pull request #4998 from vvanelslande/count
dedicated_room: fix crash (count != 0) when closing the room
This commit is contained in:
commit
5fa71d425b
|
@ -353,17 +353,7 @@ int main(int argc, char** argv) {
|
||||||
std::string in;
|
std::string in;
|
||||||
std::cin >> in;
|
std::cin >> in;
|
||||||
if (in.size() > 0) {
|
if (in.size() > 0) {
|
||||||
if (announce) {
|
break;
|
||||||
announce_session->Stop();
|
|
||||||
}
|
|
||||||
announce_session.reset();
|
|
||||||
// Save the ban list
|
|
||||||
if (!ban_list_file.empty()) {
|
|
||||||
SaveBanList(room->GetBanList(), ban_list_file);
|
|
||||||
}
|
|
||||||
room->Destroy();
|
|
||||||
Network::Shutdown();
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
std::this_thread::sleep_for(std::chrono::milliseconds(100));
|
std::this_thread::sleep_for(std::chrono::milliseconds(100));
|
||||||
}
|
}
|
||||||
|
|
Reference in New Issue