Ensure D2D device context is not used outside Begin/End draw (#13011)

* Ensure D2D device context is not used outside Begin/End draw * Change files
microsoft · Apr 29, 2024 · 5fa1ba4 · 5fa1ba4
1 parent 8d06a80
commit 5fa1ba4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/change/react-native-windows-b9725ce8-aa24-4cc7-bb58-901190465ffc.json b/change/react-native-windows-b9725ce8-aa24-4cc7-bb58-901190465ffc.json
@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "Ensure D2D device context is not used outside Begin/End draw",
+  "packageName": "react-native-windows",
+  "email": "30809111+acoates-ms@users.noreply.github.com",
+  "dependentChangeType": "patch"
+}
diff --git a/vnext/Microsoft.ReactNative.Cxx/AutoDraw.h b/vnext/Microsoft.ReactNative.Cxx/AutoDraw.h
@@ -20,6 +20,7 @@ class AutoDrawDrawingSurface {
 
   ~AutoDrawDrawingSurface() noexcept {
     if (m_d2dDeviceContext) {
+      m_d2dDeviceContext = nullptr;
       m_drawingSurfaceInterop->EndDraw();
     }
   }