Don't show tuner on spectral display while disabled (#1236)

DSheirer · May 7, 2022 · 36de812 · 36de812
1 parent 925353d
commit 36de812
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/src/main/java/io/github/dsheirer/spectrum/ClearTunerMenuItem.java b/src/main/java/io/github/dsheirer/spectrum/ClearTunerMenuItem.java
@@ -36,9 +36,9 @@ public ClearTunerMenuItem(SpectralDisplayPanel spectralDisplayPanel)
             @Override
             public void actionPerformed(ActionEvent e)
             {
-                mSpectralDisplayPanel.clearTuner();
                 SystemProperties properties = SystemProperties.getInstance();
                 properties.set(SpectralDisplayPanel.SPECTRAL_DISPLAY_ENABLED, false);
+                mSpectralDisplayPanel.clearTuner();
             }
         });
     }

diff --git a/src/main/java/io/github/dsheirer/spectrum/ShowTunerMenuItem.java b/src/main/java/io/github/dsheirer/spectrum/ShowTunerMenuItem.java
@@ -49,9 +49,9 @@ public void actionPerformed(ActionEvent e)
                     @Override
                     public void run()
                     {
-                        mDiscoveredTunerModel.broadcast(new TunerEvent(mTuner, TunerEvent.Event.REQUEST_MAIN_SPECTRAL_DISPLAY));
                         SystemProperties properties = SystemProperties.getInstance();
                         properties.set(SpectralDisplayPanel.SPECTRAL_DISPLAY_ENABLED, true);
+                        mDiscoveredTunerModel.broadcast(new TunerEvent(mTuner, TunerEvent.Event.REQUEST_MAIN_SPECTRAL_DISPLAY));
                     }
                 });
             }

diff --git a/src/main/java/io/github/dsheirer/spectrum/SpectralDisplayPanel.java b/src/main/java/io/github/dsheirer/spectrum/SpectralDisplayPanel.java
@@ -423,6 +423,11 @@ public void process(SourceEvent event)
     public void showTuner(Tuner tuner)
     {
         clearTuner();
+        if(!SystemProperties.getInstance().get(SpectralDisplayPanel.SPECTRAL_DISPLAY_ENABLED, true))
+        {
+            //Spectral display is disabled, stop
+            return;
+        }
 
         mComplexDftProcessor.clearBuffer();