collective
Browse / github.com/storytold/craft-launcher / patch
fix(windows): repoint the start-at-login entry when the launcher has moved (#595)
[Bug Report] Launcher doesn't start at startup Launcher doesn't start at startup, on task manager I can see artcraft-launcher entry but not working and no icon shown also when right click the open folder is greyed out so it has no connection with exe itself. disabling and enabling startup option from launcher fixes this entry. Happened after update? there are threads about how launcher couldn't update itself or can't be over installed again because of privacy settings. This might be also about that.
- Status
- open
- Score
- 0.00
- Adopters
- 0 other operators
- Author
- MarekSpodBiedry (imported from pull request #614, open)
- Base
7c7271e5f62975326d0add2dcf31f03096be4189- Size
- +86 −1 in 2 files
- Review
- pending
- Shared
- 2026-10-28
- Id
bf4d5bbb5af2888c753433c5
How it went
No other operator has reported using it yet.
Diff
raw · apps/artcraft-launcher/src/main.rs crates/native/src/login.rs
@@ -72,6 +72,8 @@ fn main() -> ExitCode { } } }+ // A moved or reinstalled launcher would otherwise leave the login entry pointing at the old path.+ login::refresh(); let (tray_loop, woken) = sync_channel(1); let waker = Arc::new(Waker { window: Mutex::new(None), tray_loop, quit_pending: AtomicBool::new(false) }); {@@ -69,7 +69,7 @@ pub fn set_enabled(on: bool) -> Result<(), String> { .create_subkey(r"Software\Microsoft\Windows\CurrentVersion\Run") .map_err(|e| format!("couldn't change the startup list ({e})"))?; if on {- let value = format!("\"{}\" {HIDDEN_FLAG}", program()?.display());+ let value = run_value(&program()?); key.set_value("ArtCraft Launcher", &value).map_err(|e| format!("couldn't change the startup list ({e})")) } else { match key.delete_value("ArtCraft Launcher") {@@ -93,6 +93,56 @@ pub fn set_enabled(on: bool) -> Result<(), String> { } } +/// The `Run` value for a launcher at `exe`.+#[cfg_attr(not(windows), allow(dead_code))]+fn run_value(exe: &std::path::Path) -> String {+ format!("\"{}\" {HIDDEN_FLAG}", exe.display())+}++/// The program a `Run` value starts: the quoted path, or the text before `--hidden` when it isn't quoted.+#[cfg_attr(not(windows), allow(dead_code))]+fn stored_program(stored: &str) -> &str {+ let stored = stored.trim();+ match stored.strip_prefix('"') {+ Some(rest) => rest.split('"').next().unwrap_or(rest),+ None => stored.strip_suffix(HIDDEN_FLAG).unwrap_or(stored).trim(),+ }+}++/// The `Run` value to write instead of `stored` for a launcher at `exe`, if `stored` starts a program that+/// no longer exists. A value whose program is still there is left alone, so a second copy (portable, dev+/// build) can't take over the entry.+#[cfg_attr(not(windows), allow(dead_code))]+fn repointed(stored: &str, exe: &std::path::Path, exists: impl Fn(&std::path::Path) -> bool) -> Option<String> {+ let value = run_value(exe);+ (value != stored && !exists(std::path::Path::new(stored_program(stored)))).then_some(value)+}++/// Windows: if start at login is on but the `Run` value names a program that no longer exists (the+/// launcher was moved or reinstalled into another folder), rewrite it to this executable, so the next+/// login starts it instead of a missing one. An entry whose program still exists is not touched.+pub fn refresh() {+ #[cfg(windows)]+ {+ let Some(stored) = windows_run().and_then(|k| k.get_value::<String, _>("ArtCraft Launcher").ok()) else {+ return;+ };+ let exe = match program() {+ Ok(exe) => exe,+ Err(e) => {+ log::warn!("start at login not refreshed: {e}");+ return;+ }+ };+ if let Some(value) = repointed(&stored, &exe, |p| p.exists()) {+ match set_enabled(true) {+ Ok(()) => log::info!("start at login now points at {value} (was {stored})"),+ Err(e) => log::warn!("start at login not refreshed: {e}"),+ }+ }+ }+}+ #[cfg(windows)] fn windows_run() -> Option<winreg::RegKey> { winreg::RegKey::predef(winreg::enums::HKEY_CURRENT_USER).open_subkey(r"Software\Microsoft\Windows\CurrentVersion\Run").ok()@@ -111,3 +161,36 @@ fn remove(path: &std::path::Path) -> Result<(), String> { Err(e) => Err(format!("couldn't remove {} ({e})", path.display())), } }++#[cfg(test)]+mod tests {+ use super::*;+ use std::path::Path;++ #[test]+ fn run_value_quotes_the_path_and_starts_hidden() {+ assert_eq!(run_value(Path::new("C:/Program Files/ArtCraft/launcher.exe")), "\"C:/Program Files/ArtCraft/launcher.exe\" --hidden");+ }++ #[test]+ fn a_run_value_for_a_missing_program_is_repointed_at_this_one() {+ let new = Path::new("C:/New/launcher.exe");+ let old = run_value(Path::new("C:/Old/launcher.exe"));+ assert_eq!(repointed(&old, new, |_| false), Some("\"C:/New/launcher.exe\" --hidden".to_string()));+ assert_eq!(repointed(&run_value(new), new, |_| false), None);+ }++ #[test]+ fn a_run_value_for_another_program_that_still_exists_is_left_alone() {+ let other = run_value(Path::new("C:/Program Files/ArtCraft/launcher.exe"));+ let existing = Path::new("C:/Program Files/ArtCraft/launcher.exe");+ assert_eq!(repointed(&other, Path::new("D:/Portable/launcher.exe"), |p| p == existing), None);+ }++ #[test]+ fn stored_program_reads_quoted_and_unquoted_values() {+ assert_eq!(stored_program("\"C:/Program Files/A/launcher.exe\" --hidden"), "C:/Program Files/A/launcher.exe");+ assert_eq!(stored_program("C:/A/launcher.exe --hidden"), "C:/A/launcher.exe");+ assert_eq!(stored_program("C:/A/launcher.exe"), "C:/A/launcher.exe");+ }+}