Backends: Metal: Fixed a crash on application resources. (#8367, #7419) [@anszom]

ocornut · ocornut · commit 204cebc8fc56 · 2025-02-03T14:21:53.000+01:00
diff --git a/backends/imgui_impl_metal.mm b/backends/imgui_impl_metal.mm
@@ -311,11 +311,11 @@ void ImGui_ImplMetal_RenderDrawData(ImDrawData* drawData, id<MTLCommandBuffer> c
         indexBufferOffset += (size_t)draw_list->IdxBuffer.Size * sizeof(ImDrawIdx);
     }
 
-    __block MetalContext* sharedMetalContext = bd->SharedMetalContext;
+    MetalContext* sharedMetalContext = bd->SharedMetalContext;
     [commandBuffer addCompletedHandler:^(id<MTLCommandBuffer>)
     {
         dispatch_async(dispatch_get_main_queue(), ^{
-            @synchronized(bd->SharedMetalContext.bufferCache)
+            @synchronized(sharedMetalContext.bufferCache)
             {
                 [sharedMetalContext.bufferCache addObject:vertexBuffer];
                 [sharedMetalContext.bufferCache addObject:indexBuffer];
diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt
@@ -43,9 +43,9 @@ Breaking changes:
 
 Other changes:
 
-- Fixed IsItemDeactivatedAfterEdit() signal being broken for Checkbox(), Selectable(). (#8370)
-  Regression from 2025/01/13.
-
+- Fixed IsItemDeactivatedAfterEdit() signal being broken for Checkbox(),
+  RadioButton(), Selectable(). Regression from 2025/01/13. (#8370)
+- Backends: Metal: Fixed a crash on application resources. (#8367, #7419) [@anszom]
 
 -----------------------------------------------------------------------
  VERSION 1.91.8 (Released 2025-01-31)

Original file line number	Diff line number	Diff line change
`@@ -311,11 +311,11 @@ void ImGui_ImplMetal_RenderDrawData(ImDrawData* drawData, id<MTLCommandBuffer> c`
`311`	`311`	`indexBufferOffset += (size_t)draw_list->IdxBuffer.Size * sizeof(ImDrawIdx);`
`312`	`312`	`}`
`313`	`313`
`314`		`- __block MetalContext* sharedMetalContext = bd->SharedMetalContext;`
	`314`	`+ MetalContext* sharedMetalContext = bd->SharedMetalContext;`
`315`	`315`	`[commandBuffer addCompletedHandler:^(id<MTLCommandBuffer>)`
`316`	`316`	`{`
`317`	`317`	`dispatch_async(dispatch_get_main_queue(), ^{`
`318`		`- @synchronized(bd->SharedMetalContext.bufferCache)`
	`318`	`+ @synchronized(sharedMetalContext.bufferCache)`
`319`	`319`	`{`
`320`	`320`	`[sharedMetalContext.bufferCache addObject:vertexBuffer];`
`321`	`321`	`[sharedMetalContext.bufferCache addObject:indexBuffer];`