From 88997866282c9875355b7d5798ad447eaa94ea5d Mon Sep 17 00:00:00 2001 From: dignow Date: Thu, 29 Jun 2023 20:41:33 +0800 Subject: [PATCH] debug ok Signed-off-by: dignow --- libs/clipboard/src/context_send.rs | 2 +- libs/clipboard/src/lib.rs | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libs/clipboard/src/context_send.rs b/libs/clipboard/src/context_send.rs index 95350effc..76f8e4d7a 100644 --- a/libs/clipboard/src/context_send.rs +++ b/libs/clipboard/src/context_send.rs @@ -2,7 +2,7 @@ use crate::cliprdr::*; use hbb_common::log; use std::sync::Mutex; -const CLIPBOARD_RESPONSE_WAIT_TIMEOUT_SECS: u32 = 0; +const CLIPBOARD_RESPONSE_WAIT_TIMEOUT_SECS: u32 = 30; lazy_static::lazy_static! { static ref CONTEXT_SEND: ContextSend = ContextSend{addr: Mutex::new(0)}; diff --git a/libs/clipboard/src/lib.rs b/libs/clipboard/src/lib.rs index 3a9c6308c..63f8df165 100644 --- a/libs/clipboard/src/lib.rs +++ b/libs/clipboard/src/lib.rs @@ -488,7 +488,11 @@ extern "C" fn notify_callback(conn_id: UINT32, msg: *const NOTIFICATION_MESSAGE) } ); let title = "Clipboard"; - let text = format!("{}: {}", m, d); + let text = if d.is_empty() { + m.to_string() + } else { + format!("{} {}", m, d) + }; ClipboardFile::NotifyCallback { r#type: msgtype, title: title.to_string(),