Merge branch 'master' into feature/http-ms

1 files changed, 0 insertions, 6 deletions

diff --git a/src/aosfxplayer.cpp b/src/aosfxplayer.cpp
index 000b6a7e..fcdeb949 100644
--- a/src/aosfxplayer.cpp
+++ b/src/aosfxplayer.cpp
@@ -47,12 +47,6 @@ void AOSfxPlayer::play(QString p_sfx, QString p_character, QString p_misc)
   set_volume_internal(m_volume);
 
   BASS_ChannelSetDevice(m_stream_list[m_channel], BASS_GetDevice());
-  int f_bass_error = BASS_ErrorGetCode();
-  if (f_bass_error == BASS_ERROR_DEVICE) {
-    ao_app->doBASSreset();
-    BASS_ChannelSetDevice(m_stream_list[m_channel], BASS_GetDevice());
-  }
-
   BASS_ChannelPlay(m_stream_list[m_channel], false);
   BASS_ChannelSetSync(m_stream_list[m_channel], BASS_SYNC_DEV_FAIL, 0,
                       ao_app->BASSreset, 0);