krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Call LOG_QUIT after Networking's dtor call

Browse source
This commit is contained in:
Koncord 2016-09-30 18:13:50 +08:00
parent add1a5e5b2
commit 94d5efdfd3
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/openmw-mp/Networking.cpp
View file

@ -30,10 +30,10 @@ Networking::Networking(RakNet::RakPeerInterface *peer)
controller->SetStream(0, &bsOut); // set send stream controller->SetStream(0, &bsOut); // set send stream
Script::Call<Script::CallbackIdentity("OnServerInit")>();
running = true; running = true;
exitCode = 0; exitCode = 0;
Script::Call<Script::CallbackIdentity("OnServerInit")>();
} }
Networking::~Networking() Networking::~Networking()
@ -42,6 +42,7 @@ Networking::~Networking()
sThis = 0; sThis = 0;
delete controller; delete controller;
LOG_QUIT();
} }
void Networking::Update(RakNet::Packet *packet) void Networking::Update(RakNet::Packet *packet)
@ -411,7 +412,6 @@ void Networking::StopServer(int code)
{ {
running = false; running = false;
exitCode = code; exitCode = code;
} }
int Networking::MainLoop() int Networking::MainLoop()

2
apps/openmw-mp/main.cpp
View file

@ -202,8 +202,6 @@ int main(int argc, char *argv[])
if (code == 0) if (code == 0)
LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "%s", "Quitting peacefully."); LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "%s", "Quitting peacefully.");
LOG_QUIT();
// Restore cout and cerr // Restore cout and cerr
std::cout.rdbuf(cout_rdbuf); std::cout.rdbuf(cout_rdbuf);
std::cerr.rdbuf(cerr_rdbuf); std::cerr.rdbuf(cerr_rdbuf);