[Gemrb-commits] gemrb: branch master updated. v0.7.2-55-g2b57282

[Jaka K. <lyn...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  2b57282269b91bafd4a48f188391c81c27cfe79f (commit)

Summary of changes:
 gemrb/plugins/OpenALAudio/OpenALAudio.cpp |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
      from  8cdccdeebc103d16b4a0144e7fbbfa64d9121696 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=2b57282269b91bafd4a48f188391c81c27cfe79f

commit 2b57282269b91bafd4a48f188391c81c27cfe79f
Author: Andrea Palmatè <an...@am...>
Date:   Sun Dec 9 21:39:10 2012 +0100

    added amiga fix for crash on exit

diff --git a/gemrb/plugins/OpenALAudio/OpenALAudio.cpp b/gemrb/plugins/OpenALAudio/OpenALAudio.cpp
index 697815a..adcf3e9 100644
--- a/gemrb/plugins/OpenALAudio/OpenALAudio.cpp
+++ b/gemrb/plugins/OpenALAudio/OpenALAudio.cpp
@@ -248,7 +248,10 @@ OpenALAudioDriver::~OpenALAudioDriver(void)
 	}
 
 	stayAlive = false;
+// AmigaOS4 can't kill threads and would just wait forever
+#ifndef __amigaos4__
 	SDL_WaitThread(musicThread, NULL);
+#endif
 
 	for(int i =0; i<num_streams; i++) {
 		streams[i].ForceClear();

-----------------------------------------------------------------------


This is an automated email from the git hooks/post-receive script.
-- 
gemrb: Infinity Engine emulator