From a02dbae7d3f2bcbf04097ec808ce462f605a6330 Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Fri, 23 Dec 2016 20:07:49 -0500 Subject: [PATCH] Prevent active switch from changing mode --- src/forms/Bookmark/BookmarkView.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/forms/Bookmark/BookmarkView.cpp b/src/forms/Bookmark/BookmarkView.cpp index b3a5a98..933b9b6 100644 --- a/src/forms/Bookmark/BookmarkView.cpp +++ b/src/forms/Bookmark/BookmarkView.cpp @@ -365,9 +365,10 @@ void BookmarkView::onTreeActivate( wxTreeEvent& event ) { if (tvi) { if (tvi->type == TreeViewItem::TREEVIEW_ITEM_TYPE_ACTIVE) { if (!tvi->demod->isActive()) { - wxGetApp().setFrequency(tvi->demod->getFrequency()); - wxGetApp().getDemodMgr().setActiveDemodulator(nullptr,true); + + wxGetApp().getDemodMgr().setActiveDemodulator(tvi->demod,true); wxGetApp().getDemodMgr().setActiveDemodulator(tvi->demod,false); + wxGetApp().setFrequency(tvi->demod->getFrequency()); nextDemod = tvi->demod; } } else if (tvi->type == TreeViewItem::TREEVIEW_ITEM_TYPE_RECENT) {