Skip to content

merge queue: checking #7915 on main (fd02ed2) #8014

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mergify wants to merge 2 commits into from
Closed

merge queue: checking #7915 on main (fd02ed2) #8014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
557e71f
refactor: move restart_after_pending_update to tauri state instead of…
Sychic Oct 9, 2026
2d71518
Merge of #7915
mergify[bot] Oct 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions apps/app/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

use native_dialog::{DialogBuilder, MessageLevel};
use std::env;
use std::sync::atomic::Ordering;
use std::sync::atomic::{AtomicBool, Ordering};
use tauri::{Listener, Manager};
use tauri_plugin_fs::FsExt;
use theseus::prelude::*;
Expand Down Expand Up @@ -101,14 +101,15 @@ fn restart_app(app: tauri::AppHandle) {
app.restart();
}

#[derive(Default)]
struct RestartAfterPendingUpdate(AtomicBool);

#[tauri::command]
async fn set_restart_after_pending_update(
should_restart: bool,
restart: tauri::State<'_, RestartAfterPendingUpdate>,
) -> api::Result<()> {
let state = State::get().await?;
state
.restart_after_pending_update
.store(should_restart, Ordering::Relaxed);
restart.0.store(should_restart, Ordering::Relaxed);
Ok(())
}

Expand Down Expand Up @@ -328,6 +329,7 @@ fn main() {
.plugin(api::friends::init())
.plugin(api::worlds::init())
.manage(PendingUpdateData::default())
.manage(RestartAfterPendingUpdate::default())
.invoke_handler(tauri::generate_handler![
initialize_state,
is_dev,
Expand Down Expand Up @@ -363,11 +365,10 @@ fn main() {
#[cfg(feature = "updater")]
if matches!(&event, tauri::RunEvent::Exit) {
let update_data = app.state::<PendingUpdateData>().inner();
let should_restart = State::get_if_initialized()
.map(|s| {
s.restart_after_pending_update.load(Ordering::Relaxed)
})
.unwrap_or(false);
let should_restart = app
.state::<RestartAfterPendingUpdate>()
.0
.load(Ordering::Relaxed);
if let Some((update, data)) = &*update_data.0.lock().unwrap()
{
fn set_changelog_toast(version: Option<String>) {
Expand Down
3 changes: 0 additions & 3 deletions packages/app-lib/src/state/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,6 @@ pub struct State {
/// Friends socket
pub friends_socket: FriendsSocket,

pub restart_after_pending_update: AtomicBool,

pub(crate) pool: SqlitePool,

pub(crate) file_watcher: FileWatcher,
Expand Down Expand Up @@ -418,7 +416,6 @@ impl State {
discord_rpc,
process_manager,
friends_socket,
restart_after_pending_update: AtomicBool::new(false),
pool,
file_watcher,
// app_identifier,
Expand Down
Loading