Merge branch 'fix-for-real-this-time'

synap5e · Jun 23, 2015 · 26d8003 · 26d8003
2 parents ff70d4a + 85d1961
commit 26d8003
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/Assets/Maya/Player Model/Hands_To_Unity.fbm.meta b/Assets/Maya/Player Model/Hands_To_Unity.fbm.meta
diff --git a/Assets/Scripts/AudioController.cs b/Assets/Scripts/AudioController.cs
@@ -230,7 +230,8 @@ public void changeVolume(){
 		float musicVolume = GetComponent<SettingsController>().musicVolume/10f;
 		foreach (AudioSource a in audiosourceDic.Keys) 
 			a.volume = masterVolume * soundEffectsVolume * audiosourceDic[a];
-		musicSource.volume = masterVolume * musicVolume;
+		if (musicSource) 
+            musicSource.volume = masterVolume * musicVolume;
 	}