From 49e136aa1cba83233734d6c0c1f24aa2b9b54752 Mon Sep 17 00:00:00 2001
From: erikkaashoek <erik@kaashoek.com>
Date: Wed, 9 Dec 2020 18:40:08 +0100
Subject: [PATCH] Corrected output on/off command

---
 .settings/language.settings.xml | 2 +-
 sa_cmd.c                        | 2 +-
 ui_sa.c                         | 7 +++++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml
index 4408aa2..9c2ffe1 100644
--- a/.settings/language.settings.xml
+++ b/.settings/language.settings.xml
@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-1446236912834954" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="1944045455541829" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
diff --git a/sa_cmd.c b/sa_cmd.c
index 915a3d4..2a1f404 100644
--- a/sa_cmd.c
+++ b/sa_cmd.c
@@ -122,7 +122,7 @@ VNA_SHELL_FUNCTION(cmd_output)
   } else
     goto usage;
 #endif
-  int m = generic_option_cmd("output", "off|on", argc, argv[0]);
+  int m = generic_option_cmd("output", "on|off", argc, argv[0]);
   if (m>=0) {
     setting.mute = m;
     dirty = true;
diff --git a/ui_sa.c b/ui_sa.c
index 6468d70..5ae89c2 100644
--- a/ui_sa.c
+++ b/ui_sa.c
@@ -1184,14 +1184,21 @@ static UI_FUNCTION_ADV_CALLBACK(menu_harmonic_acb)
 }
 #endif
 
+
+#define AUTO_ICON(S) (S>=2?BUTTON_ICON_CHECK_AUTO:S)            // Depends on order of ICONs!!!!!
+
 static UI_FUNCTION_ADV_CALLBACK(menu_settings_agc_acb){
   (void)item;
   (void)data;
   if(b){
+#if 0
     if (S_IS_AUTO(setting.agc))
       b->icon = BUTTON_ICON_CHECK_AUTO;
     else
       b->icon = setting.agc ? BUTTON_ICON_CHECK : BUTTON_ICON_NOCHECK;
+#else
+    b->icon = AUTO_ICON(setting.agc);
+#endif
     return;
   }
   toggle_AGC();