Merge branch 'development' into LTS_development

2015-07-01 16:59:33 +02:00 · 2015-07-01 16:59:33 +02:00 · a9971f07cf
commit a9971f07cf
parent 8f37536403 b93841f659
2 changed files with 11 additions and 2 deletions
--- a/lib/shared_memory.cpp
+++ b/lib/shared_memory.cpp
@ -772,6 +772,7 @@ namespace IPC {
                DEBUG_MSG(DLVL_WARN, "Client %u disconnect timed out", id);
                break;
              default:
+                #ifndef NOCRASHCHECK
                if(*counter > 10 && *counter < 126 ){
                  if(*counter < 30){
                    if (*counter > 15){
@ -783,6 +784,7 @@ namespace IPC {
                    Util::Procs::Murder(tmpPID); //improved kill      
                  }
                }
+                #endif
                break;
            }
            if (*counter == 127 || *counter == 126 || *counter == 255 || *counter == 254) {