No sfx play fix

Algorithman · Aug 15, 2016 · c3a1789 · c3a1789
1 parent ff2cfab
commit c3a1789
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 9 deletions.
diff --git a/SoundCenSe GTK/Misc/Misc.csproj b/SoundCenSe GTK/Misc/Misc.csproj
@@ -7,7 +7,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Misc</RootNamespace>
     <AssemblyName>Misc</AssemblyName>
-    <ReleaseVersion>1.4.1</ReleaseVersion>
+    <ReleaseVersion>1.4.2</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/SoundCenSe GTK/SoundCenSeGTK.sln b/SoundCenSe GTK/SoundCenSeGTK.sln
@@ -182,6 +182,6 @@ Global
 		$0.VersionControlPolicy = $28
 		$28.inheritsSet = Mono
 		description = SoundCenSe, a audio engine for Dwarf Fortress, based on ZweiStein's SoundSense
-		version = 1.4.1
+		version = 1.4.2
 	EndGlobalSection
 EndGlobal
diff --git a/SoundCenSe GTK/SoundCenSeGTK/Output/fmodPlayer.cs b/SoundCenSe GTK/SoundCenSeGTK/Output/fmodPlayer.cs
@@ -151,11 +151,14 @@ public void PlaySound(SoundSoundFile sf, string channel, float volume = 1.0f, bo
             FMOD.Sound newSound;
             if (sf.Sound.loop == Loop.Stop_Looping)
             {
-                fmodChannelSound chan = FmodChannelPool.Instance.GetSingleChannel(channel.ToLower());
-                if (chan != null)
+                if (!string.IsNullOrEmpty(channel))
                 {
-                    chan.SoundSoundFile = sf;
-                    chan.StopLooping();
+                    fmodChannelSound chan = FmodChannelPool.Instance.GetSingleChannel(channel.ToLower());
+                    if (chan != null)
+                    {
+                        chan.SoundSoundFile = sf;
+                        chan.StopLooping();
+                    }
                 }
             }
 

diff --git a/SoundCenSe GTK/SoundCenSeGTK/Properties/AssemblyInfo.cs b/SoundCenSe GTK/SoundCenSeGTK/Properties/AssemblyInfo.cs
@@ -17,7 +17,7 @@
 // The form "{Major}.{Minor}.*" will automatically update the build and revision,
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
-[assembly: AssemblyVersion ("1.4.1.*")]
+[assembly: AssemblyVersion ("1.4.2.*")]
 
 // The following attributes are used to specify the signing key for the assembly,
 // if desired. See the Mono documentation for more information about signing.

diff --git a/SoundCenSe GTK/SoundCenSeGTK/SoundCenSeGTK.csproj b/SoundCenSe GTK/SoundCenSeGTK/SoundCenSeGTK.csproj
@@ -7,7 +7,7 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>SoundCenSeGTK</RootNamespace>
     <AssemblyName>SoundCenSeGTK</AssemblyName>
-    <ReleaseVersion>1.4.1</ReleaseVersion>
+    <ReleaseVersion>1.4.2</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/SoundCenSe GTK/SoundCenSeGUI/SoundCenSeGUI.csproj b/SoundCenSe GTK/SoundCenSeGUI/SoundCenSeGUI.csproj
@@ -7,7 +7,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>SoundCenSeGUI</RootNamespace>
     <AssemblyName>SoundCenSeGUI</AssemblyName>
-    <ReleaseVersion>1.4.1</ReleaseVersion>
+    <ReleaseVersion>1.4.2</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>