From 50f043ca9ceb58854df99e67ece6dc5757c32467 Mon Sep 17 00:00:00 2001 From: Admin Date: Thu, 24 Sep 2026 00:00:53 +0000 Subject: [PATCH] fix: harden printer selection and setup --- src-tauri/src/printers.rs | 4 ++-- src/main.ts | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src-tauri/src/printers.rs b/src-tauri/src/printers.rs index 5a6f21b..d6dde50 100644 --- a/src-tauri/src/printers.rs +++ b/src-tauri/src/printers.rs @@ -69,7 +69,7 @@ pub fn install_virtual_printer(target_printer: &str) -> Result String { - value.replace(''', "''") + value.replace('\'', "''") } #[cfg(target_os = "linux")] diff --git a/src/main.ts b/src/main.ts index a876e3b..b841d87 100644 --- a/src/main.ts +++ b/src/main.ts @@ -69,7 +69,7 @@ let config: AppConfig let jobs: Job[] = [] let status: Status let loginTimer: number | undefined -let currentVersion = '0.1.1' +let currentVersion = '0.1.2' let bundleType: BundleType | null = null let availableUpdate: Update | null = null let updateBusy = false @@ -218,7 +218,7 @@ function writeForm(next: AppConfig) { function renderPrinters() { const select = el('forwardPrinter') - const current = config?.forwardPrinter || select.value + const current = select.value || config?.forwardPrinter || '' const options = systemPrinters.filter((printer) => !printer.isVirtual) select.innerHTML = '' + options.map((printer) => { @@ -291,7 +291,11 @@ async function refreshStatus() { el('forwardPrinter').addEventListener('change', () => { const selected = systemPrinters.find((printer) => printer.name === el('forwardPrinter').value) - if (selected?.address) el('forwardAddr').value = selected.address + if (selected?.address) { + el('forwardAddr').value = selected.address + } else if (selected) { + el('forwardAddr').value = '' + } renderPrinters() })