mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-17 07:49:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Remove deadlock from gpui2 pasteboard

Browse source
This commit is contained in:
Conrad Irwin 2023-10-27 11:14:13 +02:00
parent d2ab0d651e
commit af0c010b4a
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
crates/gpui2/src/platform/mac/platform.rs
View file

@ -185,8 +185,7 @@ impl MacPlatform {
})) }))
} }
unsafe fn read_from_pasteboard(&self, kind: id) -> Option<&[u8]> { unsafe fn read_from_pasteboard(&self, pasteboard: *mut Object, kind: id) -> Option<&[u8]> {
let pasteboard = self.0.lock().pasteboard;
let data = pasteboard.dataForType(kind); let data = pasteboard.dataForType(kind);
if data == nil { if data == nil {
None None
@ -787,14 +786,16 @@ impl Platform for MacPlatform {
fn read_from_clipboard(&self) -> Option<ClipboardItem> { fn read_from_clipboard(&self) -> Option<ClipboardItem> {
let state = self.0.lock(); let state = self.0.lock();
unsafe { unsafe {
if let Some(text_bytes) = self.read_from_pasteboard(NSPasteboardTypeString) { if let Some(text_bytes) =
self.read_from_pasteboard(state.pasteboard, NSPasteboardTypeString)
{
let text = String::from_utf8_lossy(text_bytes).to_string(); let text = String::from_utf8_lossy(text_bytes).to_string();
let hash_bytes = self let hash_bytes = self
.read_from_pasteboard(state.text_hash_pasteboard_type) .read_from_pasteboard(state.pasteboard, state.text_hash_pasteboard_type)
.and_then(|bytes| bytes.try_into().ok()) .and_then(|bytes| bytes.try_into().ok())
.map(u64::from_be_bytes); .map(u64::from_be_bytes);
let metadata_bytes = self let metadata_bytes = self
.read_from_pasteboard(state.metadata_pasteboard_type) .read_from_pasteboard(state.pasteboard, state.metadata_pasteboard_type)
.and_then(|bytes| String::from_utf8(bytes.to_vec()).ok()); .and_then(|bytes| String::from_utf8(bytes.to_vec()).ok());
if let Some((hash, metadata)) = hash_bytes.zip(metadata_bytes) { if let Some((hash, metadata)) = hash_bytes.zip(metadata_bytes) {