Creepso/stremio-shell-ng
1
0
Fork 0
mirror of https://github.com/Stremio/stremio-shell-ng.git synced 2026-04-21 07:41:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use try_borrow to prevent crashes

Browse source
This commit is contained in:
Vladimir Borisov 2024-03-08 19:27:26 +02:00
parent 42fb4a9572
commit ef8c26c93e
1 changed files with 46 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
src/stremio_app/app.rs
View file

@ -28,7 +28,7 @@ pub struct MainWindow {
#[nwg_resource(source_embed: Some(&data.embed), source_embed_str: Some("MAINICON"))] #[nwg_resource(source_embed: Some(&data.embed), source_embed_str: Some("MAINICON"))]
pub window_icon: nwg::Icon, pub window_icon: nwg::Icon,
#[nwg_control(icon: Some(&data.window_icon), title: "Stremio", flags: "MAIN_WINDOW|VISIBLE")] #[nwg_control(icon: Some(&data.window_icon), title: "Stremio", flags: "MAIN_WINDOW|VISIBLE")]
#[nwg_events( OnWindowClose: [Self::on_quit(SELF, EVT_DATA)], OnInit: [Self::on_init], OnPaint: [Self::on_paint], OnMinMaxInfo: [Self::on_min_max(SELF, EVT_DATA)], OnWindowMinimize: [Self::transmit_window_state_change] )] #[nwg_events( OnWindowClose: [Self::on_quit(SELF, EVT_DATA)], OnInit: [Self::on_init], OnPaint: [Self::on_paint], OnMinMaxInfo: [Self::on_min_max(SELF, EVT_DATA)], OnWindowMinimize: [Self::transmit_window_state_change], OnWindowMaximize: [Self::transmit_window_state_change] )]
pub window: nwg::Window, pub window: nwg::Window,
#[nwg_partial(parent: window)] #[nwg_partial(parent: window)]
#[nwg_events((tray_exit, OnMenuItemSelected): [nwg::stop_thread_dispatch()], (tray_show_hide, OnMenuItemSelected): [Self::on_show_hide], (tray_topmost, OnMenuItemSelected): [Self::on_toggle_topmost]) ] #[nwg_events((tray_exit, OnMenuItemSelected): [nwg::stop_thread_dispatch()], (tray_show_hide, OnMenuItemSelected): [Self::on_show_hide], (tray_topmost, OnMenuItemSelected): [Self::on_toggle_topmost]) ]
@ -62,33 +62,46 @@ impl MainWindow {
.as_ref() .as_ref()
.expect("Cannont obtain communication channel for the Web UI"); .expect("Cannont obtain communication channel for the Web UI");
let web_tx_app = web_tx.clone(); let web_tx_app = web_tx.clone();
let saved_style = self.saved_window_style.borrow(); let full_screen = {
web_tx_app self.saved_window_style
.send(RPCResponse::visibility_change( .try_borrow()
self.window.visible(), .ok()
prevent_close as u32, .map(|saved_style| saved_style.full_screen)
saved_style.full_screen, };
)) if let Some(full_screen) = full_screen {
.ok(); web_tx_app
.send(RPCResponse::visibility_change(
self.window.visible(),
prevent_close as u32,
full_screen,
))
.ok();
}
} }
fn transmit_window_state_change(&self) { fn transmit_window_state_change(&self) {
if let Some(hwnd) = self.window.handle.hwnd() { if let (Some(hwnd), Ok(web_channel), Ok(style)) = (
let web_channel = self.webview.channel.borrow(); self.window.handle.hwnd(),
self.webview.channel.try_borrow(),
self.saved_window_style.try_borrow(),
) {
let state = style.clone().get_window_state(hwnd);
drop(style);
let (web_tx, _) = web_channel let (web_tx, _) = web_channel
.as_ref() .as_ref()
.expect("Cannont obtain communication channel for the Web UI"); .expect("Cannont obtain communication channel for the Web UI");
let web_tx_app = web_tx.clone(); let web_tx_app = web_tx.clone();
let style = self.saved_window_style.borrow();
let state = style.clone().get_window_state(hwnd);
web_tx_app.send(RPCResponse::state_change(state)).ok(); web_tx_app.send(RPCResponse::state_change(state)).ok();
} else {
eprintln!("Cannot obtain window handle or communication channel");
} }
} }
fn on_init(&self) { fn on_init(&self) {
self.webview.endpoint.set(self.webui_url.clone()).ok(); self.webview.endpoint.set(self.webui_url.clone()).ok();
self.webview.dev_tools.set(self.dev_tools).ok(); self.webview.dev_tools.set(self.dev_tools).ok();
if let Some(hwnd) = self.window.handle.hwnd() { if let Some(hwnd) = self.window.handle.hwnd() {
let mut saved_style = self.saved_window_style.borrow_mut(); if let Ok(mut saved_style) = self.saved_window_style.try_borrow_mut() {
saved_style.center_window(hwnd, Self::MIN_WIDTH, Self::MIN_HEIGHT); saved_style.center_window(hwnd, Self::MIN_WIDTH, Self::MIN_HEIGHT);
}
} }
self.tray.tray_show_hide.set_checked(true); self.tray.tray_show_hide.set_checked(true);
@ -218,14 +231,16 @@ impl MainWindow {
} }
fn on_toggle_fullscreen_notice(&self) { fn on_toggle_fullscreen_notice(&self) {
if let Some(hwnd) = self.window.handle.hwnd() { if let Some(hwnd) = self.window.handle.hwnd() {
let mut saved_style = self.saved_window_style.borrow_mut(); if let Ok(mut saved_style) = self.saved_window_style.try_borrow_mut() {
saved_style.toggle_full_screen(hwnd); saved_style.toggle_full_screen(hwnd);
self.tray.tray_topmost.set_enabled(!saved_style.full_screen); self.tray.tray_topmost.set_enabled(!saved_style.full_screen);
self.tray self.tray
.tray_topmost .tray_topmost
.set_checked((saved_style.ex_style as u32 & WS_EX_TOPMOST) == WS_EX_TOPMOST); .set_checked((saved_style.ex_style as u32 & WS_EX_TOPMOST) == WS_EX_TOPMOST);
drop(saved_style);
self.transmit_window_full_screen_change(true);
}
} }
self.transmit_window_full_screen_change(true);
} }
fn on_hide_splash_notice(&self) { fn on_hide_splash_notice(&self) {
self.splash_screen.hide(); self.splash_screen.hide();
@ -233,17 +248,19 @@ impl MainWindow {
fn on_focus_notice(&self) { fn on_focus_notice(&self) {
self.window.set_visible(true); self.window.set_visible(true);
if let Some(hwnd) = self.window.handle.hwnd() { if let Some(hwnd) = self.window.handle.hwnd() {
let mut saved_style = self.saved_window_style.borrow_mut(); if let Ok(mut saved_style) = self.saved_window_style.try_borrow_mut() {
saved_style.set_active(hwnd); saved_style.set_active(hwnd);
}
} }
} }
fn on_toggle_topmost(&self) { fn on_toggle_topmost(&self) {
if let Some(hwnd) = self.window.handle.hwnd() { if let Some(hwnd) = self.window.handle.hwnd() {
let mut saved_style = self.saved_window_style.borrow_mut(); if let Ok(mut saved_style) = self.saved_window_style.try_borrow_mut() {
saved_style.toggle_topmost(hwnd); saved_style.toggle_topmost(hwnd);
self.tray self.tray
.tray_topmost .tray_topmost
.set_checked((saved_style.ex_style as u32 & WS_EX_TOPMOST) == WS_EX_TOPMOST); .set_checked((saved_style.ex_style as u32 & WS_EX_TOPMOST) == WS_EX_TOPMOST);
}
} }
} }
fn on_show_hide(&self) { fn on_show_hide(&self) {