zobally/RustDesk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: simplify session revoked detection, let portal handle restore token

Browse source 
Signed-off-by: Steve3184 <77789906+Steve3184@users.noreply.github.com>
This commit is contained in:
Steve3184 2026-03-02 11:02:26 +08:00
parent a629f5d95a
commit 194253a5d9
1 changed files with 6 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

32
libs/scrap/src/wayland/pipewire.rs
View file

@ -338,29 +338,12 @@ impl PipeWireRecorder {
if let Err(e) = pipeline.set_state(gst::State::Playing) {
let _ = pipeline.set_state(gst::State::Null);
let is_revoked = if !is_server_running() {
// remote_desktop_portal: the portal opened the fd, so a PLAYING failure
// means the underlying PipeWire node is gone -> session revoked.
true
} else {
// screencast_portal: only treat as revoked when a persisted restore token
// exists, meaning we were trying to resume a prior session.
!config::LocalConfig::get_option(RESTORE_TOKEN_CONF_KEY).is_empty()
};
if is_revoked {
warn!("[gstreamer] Failed to set PLAYING state, session was likely revoked: {:?}", e);
if is_server_running() {
config::LocalConfig::set_option(RESTORE_TOKEN_CONF_KEY.to_owned(), "".to_owned());
}
return Err(hbb_common::anyhow::Error::new(SessionRevokedError));
} else {
warn!(
"[gstreamer] Failed to set PLAYING state on a fresh screencast session \
(no restore token). Likely a pipeline misconfiguration: {:?}",
e
);
if is_server_running() {
warn!("[gstreamer] Failed to set PLAYING state: {:?}", e);
return Err(hbb_common::anyhow::Error::msg(format!("GStreamer pipeline failed to start: {:?}", e)));
} else {
warn!("[gstreamer] Failed to set PLAYING state, session was likely revoked: {:?}", e);
return Err(hbb_common::anyhow::Error::new(SessionRevokedError));
}
}
@ -384,10 +367,7 @@ impl PipeWireRecorder {
);
if let Err(_) = result {
warn!("[gstreamer] Async pipeline error detected. Session was likely terminated, clearing XDP token...");
if is_server_running() {
config::LocalConfig::set_option(RESTORE_TOKEN_CONF_KEY.to_owned(), "".to_owned());
}
warn!("[gstreamer] Async pipeline error detected. Session was likely terminated.");
let _ = pipeline.set_state(gst::State::Null);
return Err(hbb_common::anyhow::Error::new(SessionRevokedError));
}