1 files changed, 3 insertions, 1 deletions
diff --git a/dom/media/ipc/MFMediaEngineParent.cpp b/dom/media/ipc/MFMediaEngineParent.cpp
index 0238956781..5ed1b71160 100644
--- a/dom/media/ipc/MFMediaEngineParent.cpp
+++ b/dom/media/ipc/MFMediaEngineParent.cpp
@@ -113,7 +113,6 @@ void MFMediaEngineParent::DestroyEngineIfExists(
   mRequestSampleListener.DisconnectIfExists();
   if (mDXGIDeviceManager) {
     mDXGIDeviceManager = nullptr;
-    wmf::MFUnlockDXGIDeviceManager();
   }
   if (aError) {
     Unused << SendNotifyError(*aError);
@@ -191,6 +190,9 @@ void MFMediaEngineParent::InitializeDXGIDeviceManager() {
   UINT deviceResetToken;
   RETURN_VOID_IF_FAILED(
       wmf::MFLockDXGIDeviceManager(&deviceResetToken, &mDXGIDeviceManager));
+  if (!mDXGIDeviceManager) {
+    return;
+  }
   RETURN_VOID_IF_FAILED(
       mDXGIDeviceManager->ResetDevice(d3d11Device.get(), deviceResetToken));
   LOG("Initialized DXGI manager");