diff --git a/gamedata/sm-tf2.games.txt b/gamedata/sm-tf2.games.txt index bd37cd59..eaafe74f 100644 --- a/gamedata/sm-tf2.games.txt +++ b/gamedata/sm-tf2.games.txt @@ -119,15 +119,15 @@ } "CalcIsAttackCriticalHelper" { - "windows" "385" - "linux" "392" - "mac" "392" + "windows" "384" + "linux" "391" + "mac" "391" } "CalcIsAttackCriticalHelperNoCrits" { - "windows" "386" - "linux" "393" - "mac" "393" + "windows" "385" + "linux" "392" + "mac" "392" } // CTFGameRules::IsHolidayActive diff --git a/public/amtl/am-thread-posix.h b/public/amtl/am-thread-posix.h index bc654261..c5d1b25c 100644 --- a/public/amtl/am-thread-posix.h +++ b/public/amtl/am-thread-posix.h @@ -174,6 +174,11 @@ class Thread if (!initialized_) delete data; } + ~Thread() { + if (!Succeeded()) + return; + pthread_detach(thread_); + } bool Succeeded() const { return initialized_; @@ -183,6 +188,7 @@ class Thread if (!Succeeded()) return; pthread_join(thread_, NULL); + initialized_ = false; } private: diff --git a/pushbuild.txt b/pushbuild.txt index 511bdab8..257cb30c 100644 --- a/pushbuild.txt +++ b/pushbuild.txt @@ -21,7 +21,7 @@ Invaders' blood marches through my veins, like GIANT RADIOACTIVE RUBBER PANTS! This file sure has gotten big. sawce is rukia and loves anime, sushi, and macs ur -she calls it a mayonegg +oh, it's so cute. she calls it a mayonegg not me javaliabuf64k.. "line 29" rhymes... kinda. <-- CONFIRMED