Merge remote-tracking branch 'refs/remotes/LukeUsher/master'

2016-12-13 10:46:41 +01:00 · 2016-12-13 10:46:41 +01:00 · 9f5ce65a6f
parent 90d2a34090 1f5f4f3ad0
commit 9f5ce65a6f
1 changed files with 5 additions and 3 deletions
--- a/src/CxbxKrnl/EmuDSound.cpp
+++ b/src/CxbxKrnl/EmuDSound.cpp
@ -1444,10 +1444,12 @@ HRESULT WINAPI XTL::EmuIDirectSoundBuffer8_Stop
           ");\n",
           GetCurrentThreadId(), pThis);

-    HRESULT hRet = pThis->EmuDirectSoundBuffer8->Stop();
-
+	HRESULT hRet = D3D_OK;
    
-
+	if (pThis != nullptr) {
+		hRet = pThis->EmuDirectSoundBuffer8->Stop();
+	}
+   
    return hRet;
 }