1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-07-06 02:21:37 +00:00

Merge pull request #600 from nalal/patch-2

Change "or/and" to "||/&&"
This commit is contained in:
David Cernat 2022-03-04 23:50:44 +02:00 committed by GitHub
commit 343e3f26e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -489,7 +489,7 @@ void signalHandler(int signum)
{ {
std::cout << "Interrupt signal (" << signum << ") received.\n"; std::cout << "Interrupt signal (" << signum << ") received.\n";
//15 is SIGTERM(Normal OS stop call), 2 is SIGINT(Ctrl+C) //15 is SIGTERM(Normal OS stop call), 2 is SIGINT(Ctrl+C)
if(signum == 15 or signum == 2) if(signum == 15 || signum == 2)
{ {
killLoop = true; killLoop = true;
} }
@ -507,7 +507,7 @@ int Networking::mainLoop()
sigIntHandler.sa_flags = 0; sigIntHandler.sa_flags = 0;
#endif #endif
while (running and !killLoop) while (running && !killLoop)
{ {
#ifndef _WIN32 #ifndef _WIN32
sigaction(SIGTERM, &sigIntHandler, NULL); sigaction(SIGTERM, &sigIntHandler, NULL);