teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Make sure the OpenAL stream list is clear before shutting down

Browse source
This commit is contained in:
Chris Robinson 2012-03-19 00:38:56 -07:00
parent 7194114669
commit 6a256d3993
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/openmw/mwsound/openal_output.cpp
View file

@ -156,6 +156,13 @@ struct StreamThread {
sStreams.erase(iter); sStreams.erase(iter);
sMutex.unlock(); sMutex.unlock();
} }
static void removeAll()
{
sMutex.lock();
sStreams.clear();
sMutex.unlock();
}
}; };
StreamThread::StreamVec StreamThread::sStreams; StreamThread::StreamVec StreamThread::sStreams;
boost::mutex StreamThread::sMutex; boost::mutex StreamThread::sMutex;
@ -363,6 +370,8 @@ void OpenAL_Output::init(const std::string &devname)
void OpenAL_Output::deinit() void OpenAL_Output::deinit()
{ {
StreamThread::removeAll();
alcMakeContextCurrent(0); alcMakeContextCurrent(0);
if(mContext) if(mContext)
alcDestroyContext(mContext); alcDestroyContext(mContext);