From 0119539d82af7b049b352655fddf0f29f58474c0 Mon Sep 17 00:00:00 2001 From: Patrick Linstruth Date: Sat, 27 Oct 2018 13:29:43 -0700 Subject: [PATCH 1/4] Fixed delete and voice track buttons --- ChangeLog | 2 ++ rdlogedit/rdlogedit.cpp | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b3953f03..6270c9da 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17894,3 +17894,5 @@ 2018-10-23 Fred Gleason * Fixed a bug in 'configure.ac' that caused detection of FLAC support to always fail. +2018-10-27 Patrick Linstruth + * Fix delete and voice track buttons in rdlogedit(1) diff --git a/rdlogedit/rdlogedit.cpp b/rdlogedit/rdlogedit.cpp index 2e866d15..1f7f0e94 100644 --- a/rdlogedit/rdlogedit.cpp +++ b/rdlogedit/rdlogedit.cpp @@ -631,8 +631,8 @@ void MainWidget::logSelectionChangedData() item=(ListListViewItem *)item->nextSibling(); } log_edit_button->setEnabled(count==1); - log_delete_button->setEnabled(count>0); - log_track_button->setEnabled(count==1); + log_delete_button->setEnabled(count>0&&rda->user()->deleteLog()); + log_track_button->setEnabled(count==1&&rda->user()->voicetrackLog()); } From 05ac6af7f55f516f8fae6de506b22463e7d7f832 Mon Sep 17 00:00:00 2001 From: Patrick Linstruth Date: Sat, 27 Oct 2018 16:20:36 -0700 Subject: [PATCH 2/4] Fix bug in setCart() --- lib/rdsimpleplayer.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/rdsimpleplayer.cpp b/lib/rdsimpleplayer.cpp index b9d019cd..3690a875 100644 --- a/lib/rdsimpleplayer.cpp +++ b/lib/rdsimpleplayer.cpp @@ -84,6 +84,7 @@ bool RDSimplePlayer::isPlaying() void RDSimplePlayer::setCart(unsigned cart) { play_cart=cart; + play_cut=""; } From b1365970bdb2ada34fb6baf5b275162b7e0d0efb Mon Sep 17 00:00:00 2001 From: Patrick Linstruth Date: Sat, 27 Oct 2018 16:23:19 -0700 Subject: [PATCH 3/4] Update ChangeLog --- ChangeLog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6270c9da..93d030a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17895,4 +17895,5 @@ * Fixed a bug in 'configure.ac' that caused detection of FLAC support to always fail. 2018-10-27 Patrick Linstruth - * Fix delete and voice track buttons in rdlogedit(1) + * Fix delete and voice track buttons in rdlogedit(1). + * Fix bug in RDSimplePlayer setCart() method. From bdd717a6664a8120c5fccf1d9f38bcd3dbb984be Mon Sep 17 00:00:00 2001 From: Patrick Linstruth Date: Sat, 27 Oct 2018 16:28:44 -0700 Subject: [PATCH 4/4] Delete and Voice Tracker buttons default to disabled. --- rdlogedit/rdlogedit.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rdlogedit/rdlogedit.cpp b/rdlogedit/rdlogedit.cpp index 1f7f0e94..9dc22ffb 100644 --- a/rdlogedit/rdlogedit.cpp +++ b/rdlogedit/rdlogedit.cpp @@ -300,8 +300,8 @@ void MainWidget::userData() // Set Control Perms // log_add_button->setEnabled(rda->user()->createLog()); - log_delete_button->setEnabled(rda->user()->deleteLog()); - log_track_button->setEnabled(rda->user()->voicetrackLog()); + log_delete_button->setEnabled(false); + log_track_button->setEnabled(false); }