[Bf-blender-cvs] [e9689e1] master: Fix: setting an audio callback before audio device initialization.

Jörg Müller noreply at git.blender.org
Wed Nov 9 00:12:13 CET 2016


Commit: e9689e1a204ee9b74fae7d0051b79649e79035f7
Author: Jörg Müller
Date:   Wed Nov 9 00:06:49 2016 +0100
Branches: master
https://developer.blender.org/rBe9689e1a204ee9b74fae7d0051b79649e79035f7

Fix: setting an audio callback before audio device initialization.

===================================================================

M	source/blender/blenkernel/intern/sound.c

===================================================================

diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c
index 3132a8e..f20885b 100644
--- a/source/blender/blenkernel/intern/sound.c
+++ b/source/blender/blenkernel/intern/sound.c
@@ -251,7 +251,8 @@ void BKE_sound_init(struct Main *bmain)
 void BKE_sound_init_main(struct Main *bmain)
 {
 #ifdef WITH_JACK
-	AUD_setSynchronizerCallback(sound_sync_callback, bmain);
+	if (sound_device)
+		AUD_setSynchronizerCallback(sound_sync_callback, bmain);
 #else
 	(void)bmain; /* unused */
 #endif




More information about the Bf-blender-cvs mailing list