Browse Source

Merge branch 'pr884'

pull/875/head
Tux3 / Mlkj / !Lev.uXFMLA 11 years ago
parent
commit
32863bb272
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
  1. 4
      src/audio.cpp

4
src/audio.cpp

@ -87,8 +87,6 @@ void Audio::openOutput(const QString& outDevDescr)
{ {
auto* tmp = alOutDev; auto* tmp = alOutDev;
alOutDev = nullptr; alOutDev = nullptr;
if (tmp)
alcCloseDevice(tmp);
if (outDevDescr.isEmpty()) if (outDevDescr.isEmpty())
alOutDev = alcOpenDevice(nullptr); alOutDev = alcOpenDevice(nullptr);
else else
@ -104,6 +102,8 @@ void Audio::openOutput(const QString& outDevDescr)
alcMakeContextCurrent(nullptr); alcMakeContextCurrent(nullptr);
alcDestroyContext(alContext); alcDestroyContext(alContext);
} }
if (tmp)
alcCloseDevice(tmp);
alContext=alcCreateContext(alOutDev,nullptr); alContext=alcCreateContext(alOutDev,nullptr);
if (!alcMakeContextCurrent(alContext)) if (!alcMakeContextCurrent(alContext))
{ {

Loading…
Cancel
Save