From c28426a09f57444eb8c772dac367c3ac33b163be Mon Sep 17 00:00:00 2001 From: Asher Baker Date: Tue, 6 Jan 2015 20:29:47 +0000 Subject: [PATCH 1/3] Fix threads leaking if they're not joined. (bug 3460, r=dvander) --- public/amtl/am-thread-posix.h | 6 ++++++ 1 file changed, 6 insertions(+) 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: From dfa36b77350f3f9d3375e0156586b0d6676b2976 Mon Sep 17 00:00:00 2001 From: Nicholas Hastings Date: Wed, 7 Jan 2015 14:09:36 -0500 Subject: [PATCH 2/3] Update TF2 gamedata. --- gamedata/sm-tf2.games.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 From df6dfec7280190be8b0299dfcd02fada87433af2 Mon Sep 17 00:00:00 2001 From: Nicholas Hastings Date: Fri, 9 Jan 2015 09:06:57 -0500 Subject: [PATCH 3/3] Trigger build for hl2sdk-dota update. --- pushbuild.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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