From 43c780c5c0260f5040770472495b0e43eea5869b Mon Sep 17 00:00:00 2001
From: Timon <me@timon.zip>
Date: Fri, 24 Apr 2026 17:23:37 +0000
Subject: [PATCH] safer cef texture import

---
 desktop/src/cef.rs | 36 ++++++++++++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/desktop/src/cef.rs b/desktop/src/cef.rs
index e3cc85405f..4c6c5aee13 100644
--- a/desktop/src/cef.rs
+++ b/desktop/src/cef.rs
@@ -190,8 +190,40 @@ impl CefEventHandler for CefHandler {
 	#[cfg(feature = "accelerated_paint")]
 	fn draw_gpu(&self, shared_texture: SharedTextureHandle) {
 		match shared_texture.import_texture(&self.wgpu_context.device) {
-			Ok(texture) => {
-				self.app_event_scheduler.schedule(AppEvent::UiUpdate(texture));
+			Ok(src) => {
+				let desc = wgpu::TextureDescriptor {
+					label: Some("duplicated_texture"),
+					usage: wgpu::TextureUsages::COPY_DST | src.usage(),
+					size: src.size(),
+					mip_level_count: src.mip_level_count(),
+					sample_count: src.sample_count(),
+					dimension: src.dimension(),
+					format: src.format(),
+					view_formats: &[],
+				};
+
+				let copy = self.wgpu_context.device.create_texture(&desc);
+
+				let mut encoder = self.wgpu_context.device.create_command_encoder(&wgpu::CommandEncoderDescriptor {
+					label: Some("texture_copy_encoder"),
+				});
+
+				encoder.copy_texture_to_texture(
+					src.as_image_copy(),
+					copy.as_image_copy(),
+					desc.size,
+				);
+
+				// Wait for the GPU to finish the copy before allowing the source texture to be released by CEF
+				let submission_index = self.wgpu_context.queue.submit([encoder.finish()]);
+				if let Err(error) = self.wgpu_context.device.poll(wgpu::PollType::Wait {
+					submission_index: Some(submission_index),
+					timeout: None,
+				}) {
+					tracing::error!("Failed while waiting for texture copy completion: {error}");
+				}
+
+				self.app_event_scheduler.schedule(AppEvent::UiUpdate(copy));
 			}
 			Err(e) => {
 				tracing::error!("Failed to import shared texture: {}", e);