X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/41cd057bb981b3dc00cc527485c48549a912cb2b..15c40aa2f808c1d48aab717636238aea13880f88:/projects/stargazer/user.cpp?ds=sidebyside diff --git a/projects/stargazer/user.cpp b/projects/stargazer/user.cpp index 1b7d2f4c..38bab82c 100644 --- a/projects/stargazer/user.cpp +++ b/projects/stargazer/user.cpp @@ -123,8 +123,6 @@ currIP.AddAfterNotifier(&ipNotifier); lastScanMessages = 0; -writeFreeMbTraffCost = settings->GetWriteFreeMbTraffCost(); - pthread_mutexattr_t attr; pthread_mutexattr_init(&attr); pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); @@ -206,8 +204,6 @@ currIP.AddAfterNotifier(&ipNotifier); lastScanMessages = 0; -writeFreeMbTraffCost = settings->GetWriteFreeMbTraffCost(); - property.SetProperties(u.property); pthread_mutexattr_t attr; @@ -770,7 +766,8 @@ sessionUpload[dir] += len; //Add detailed stat -if (!writeFreeMbTraffCost && freeMb.ConstData() >= 0) +if (!settings->GetWriteFreeMbTraffCost() && + freeMb.ConstData() >= 0) cost = 0; #ifdef TRAFF_STAT_WITH_PORTS @@ -860,7 +857,8 @@ sessionDownload[dir] += len; //Add detailed stat -if (!writeFreeMbTraffCost && freeMb.ConstData() >= 0) +if (!settings->GetWriteFreeMbTraffCost() && + freeMb.ConstData() >= 0) cost = 0; #ifdef TRAFF_STAT_WITH_PORTS @@ -1246,7 +1244,7 @@ while (it != messages.end()) WriteServLog("Error deleting message: '%s'", store->GetStrError().c_str()); printfd(__FILE__, "Error deleting message: '%s'\n", store->GetStrError().c_str()); } - messages.erase(it); + messages.erase(it++); } else { @@ -1255,9 +1253,9 @@ while (it != messages.end()) WriteServLog("Error modifying message: '%s'", store->GetStrError().c_str()); printfd(__FILE__, "Error modifying message: '%s'\n", store->GetStrError().c_str()); } + ++it; } } - ++it; } } //-----------------------------------------------------------------------------