From aaacd754323b89880f1c9025e88fbcbee1ea72c1 Mon Sep 17 00:00:00 2001 From: Stephen B <158498287+StephenDev0@users.noreply.github.com> Date: Sat, 12 Jul 2025 10:30:28 -0400 Subject: [PATCH] Disable default script when advanced options off (#223) --- StikJIT/Views/HomeView.swift | 5 ++++- StikJIT/Views/SettingsView.swift | 15 +++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/StikJIT/Views/HomeView.swift b/StikJIT/Views/HomeView.swift index 89f78ff..4609751 100644 --- a/StikJIT/Views/HomeView.swift +++ b/StikJIT/Views/HomeView.swift @@ -303,7 +303,10 @@ struct HomeView: View { startJITInBackground(with: selectedBundle) } } - .pipify(isPresented: $isProcessing) { + .pipify(isPresented: Binding( + get: { useDefaultScript && isProcessing }, + set: { newValue in isProcessing = newValue } + )) { RunJSViewPiP(model: $jsModel) } .sheet(isPresented: $scriptViewShow) { diff --git a/StikJIT/Views/SettingsView.swift b/StikJIT/Views/SettingsView.swift index 3f81789..8189fe8 100644 --- a/StikJIT/Views/SettingsView.swift +++ b/StikJIT/Views/SettingsView.swift @@ -272,16 +272,23 @@ struct SettingsView: View { .foregroundColor(.primary) .padding(.bottom, 4) - Toggle("Run Default Script After Connecting", isOn: $useDefaultScript) - .foregroundColor(.primary) - .padding(.vertical, 6) - Toggle("Enable Advanced Options", isOn: $enableAdvancedOptions) .foregroundColor(.primary) .padding(.vertical, 6) + + if enableAdvancedOptions { + Toggle("Run Default Script After Connecting", isOn: $useDefaultScript) + .foregroundColor(.primary) + .padding(.vertical, 6) + } } .padding(.vertical, 20) .padding(.horizontal, 16) + .onChange(of: enableAdvancedOptions) { _, newValue in + if !newValue { + useDefaultScript = false + } + } } // About section