From f085127f1ea54b91958954feb2c61f8d94ef4d37 Mon Sep 17 00:00:00 2001 From: joncham Date: Tue, 22 May 2007 17:25:07 +0000 Subject: [PATCH] 2007-05-22 Jonathan Chambers * Thread.cs: Use & to check ThreadState rather than ==. Fixes AlbumSurfer regression. git-svn-id: svn+ssh://mono-cvs.ximian.com/source/trunk/mcs@77799 e3ebcda4-bce8-0310-ba0a-eca2169e7518 --- class/corlib/System.Threading/ChangeLog | 5 +++++ class/corlib/System.Threading/Thread.cs | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/class/corlib/System.Threading/ChangeLog b/class/corlib/System.Threading/ChangeLog index 0e26a85cc1..304ab5c8ad 100644 --- a/class/corlib/System.Threading/ChangeLog +++ b/class/corlib/System.Threading/ChangeLog @@ -1,3 +1,8 @@ +2007-05-22 Jonathan Chambers + + * Thread.cs: Use & to check ThreadState rather than ==. + Fixes AlbumSurfer regression. + 2007-05-09 Jonathan Chambers * Thread.cs: Implement ApartmentState related items. diff --git a/class/corlib/System.Threading/Thread.cs b/class/corlib/System.Threading/Thread.cs index f765163ff2..e4418ef0fa 100644 --- a/class/corlib/System.Threading/Thread.cs +++ b/class/corlib/System.Threading/Thread.cs @@ -312,7 +312,7 @@ namespace System.Threading { #if NET_2_0 TrySetApartmentState (value); #else - if (ThreadState != ThreadState.Unstarted) + if ((ThreadState & ThreadState.Unstarted) == 0) throw new ThreadStateException ("Thread was in an invalid state for the operation being executed."); if (value != ApartmentState.STA && value != ApartmentState.MTA) @@ -895,7 +895,7 @@ namespace System.Threading { public bool TrySetApartmentState (ApartmentState state) { - if (ThreadState != ThreadState.Unstarted) + if ((ThreadState & ThreadState.Unstarted) == 0) throw new ThreadStateException ("Thread was in an invalid state for the operation being executed."); if ((ApartmentState)apartment_state != ApartmentState.Unknown) -- 2.11.4.GIT