From fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 19 Apr 2024 03:14:29 +0200
Subject: Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 dom/media/ipc/MFMediaEngineParent.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'dom/media/ipc/MFMediaEngineParent.cpp')

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");
-- 
cgit v1.2.3