From cdf8c730bc686854afac6d3ab085d728b7b5e3e9 Mon Sep 17 00:00:00 2001 From: "dennis.sheirer" Date: Thu, 3 Jul 2014 14:24:14 +0000 Subject: [PATCH] R820T tuner controller - resolved issue with frequency controller not maintaining sync with actual tuned frequency. --- src/controller/state/ChannelStatePanel.java | 6 ++++-- src/source/tuner/rtl/r820t/R820TTunerEditorPanel.java | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/controller/state/ChannelStatePanel.java b/src/controller/state/ChannelStatePanel.java index 9937fc5f..2ed59bd4 100644 --- a/src/controller/state/ChannelStatePanel.java +++ b/src/controller/state/ChannelStatePanel.java @@ -29,7 +29,6 @@ import java.util.HashMap; import javax.swing.JMenu; import javax.swing.JPanel; -import log.Log; import net.miginfocom.swing.MigLayout; import sample.Listener; import settings.ColorSetting; @@ -193,7 +192,10 @@ public abstract class ChannelStatePanel extends JPanel validate(); - getParent().validate(); + if( getParent() != null ) + { + getParent().validate(); + } if( panel instanceof ChannelStatePanel ) { diff --git a/src/source/tuner/rtl/r820t/R820TTunerEditorPanel.java b/src/source/tuner/rtl/r820t/R820TTunerEditorPanel.java index 009b3cda..59f9ba62 100644 --- a/src/source/tuner/rtl/r820t/R820TTunerEditorPanel.java +++ b/src/source/tuner/rtl/r820t/R820TTunerEditorPanel.java @@ -64,6 +64,9 @@ public class R820TTunerEditorPanel extends JPanel implements FrequencyChangeList mFrequencyControl.addListener( this ); + /* Add frequency control as frequency change listener. */ + mController.addListener( mFrequencyControl ); + mFrequencyControl.setFrequency( mController.getFrequency(), false ); add( mFrequencyControl, "span 2, align center, wrap" );