SlimDX update & possible multithreading bugfix

MaulingMonkey · May 28, 2011 · 7e11512 · 7e11512
1 parent 98e6615
commit 7e11512
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/UberIRC.Sounds/UberIRC.Sounds.csproj b/UberIRC.Sounds/UberIRC.Sounds.csproj
@@ -31,7 +31,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="SlimDX, Version=2.0.10.43, Culture=neutral, PublicKeyToken=b1b0c32fd1ffe4f9, processorArchitecture=x86" />
+    <Reference Include="SlimDX" />
     <Reference Include="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>

diff --git a/UberIRC/NET/IrcConnection.cs b/UberIRC/NET/IrcConnection.cs
@@ -4,9 +4,10 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
-using Industry;
 using System.Timers;
+using Industry;
 
 namespace UberIRC.NET {
 	public struct IrcConnectionID {
@@ -133,8 +134,10 @@ class Channel {
 		public readonly HashSet<IEventListener> Listeners;
 
 		public IEnumerable<String> WhosIn( string channel ) {
-			if ( Channels.ContainsKey(channel) ) return Channels[channel].Users;
-			else return new string[]{};
+			lock (Lock) {
+				if ( Channels.ContainsKey(channel) ) return Channels[channel].Users.ToArray();
+				else return new string[]{};
+			}
 		}
 
 		public void Join( string channel ) {