diff --git a/ChangeLog b/ChangeLog index de852475..780b4abc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17937,3 +17937,6 @@ 2018-10-28 Patrick Linstruth * Fixed a regression in rdlogmanaer(1) that threw a segfault when adding a Log Note to an Event. +2018-10-28 Patrick Linstruth + * Fix delete and voice track buttons in rdlogedit(1). + * Fix bug in RDSimplePlayer setCart() method. 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=""; } diff --git a/rdlogedit/rdlogedit.cpp b/rdlogedit/rdlogedit.cpp index 2e866d15..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); } @@ -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()); }