Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-06-13 06:40:26 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'deltecent-rdlogedit-user'

Browse Source
This commit is contained in:
Fred Gleason 2018-10-28 19:41:20 -04:00
commit 06b85de909
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -17937,3 +17937,6 @@
2018-10-28 Patrick Linstruth <patrick@deltecent.com> 2018-10-28 Patrick Linstruth <patrick@deltecent.com>
* Fixed a regression in rdlogmanaer(1) that threw a segfault when * Fixed a regression in rdlogmanaer(1) that threw a segfault when
adding a Log Note to an Event. adding a Log Note to an Event.
2018-10-28 Patrick Linstruth <patrick@deltecent.com>
* Fix delete and voice track buttons in rdlogedit(1).
* Fix bug in RDSimplePlayer setCart() method.

1
lib/rdsimpleplayer.cpp
View File

@ -84,6 +84,7 @@ bool RDSimplePlayer::isPlaying()
void RDSimplePlayer::setCart(unsigned cart) void RDSimplePlayer::setCart(unsigned cart)
{ {
play_cart=cart; play_cart=cart;
play_cut="";
} }

8
rdlogedit/rdlogedit.cpp
View File

@ -300,8 +300,8 @@ void MainWidget::userData()
// Set Control Perms // Set Control Perms
// //
log_add_button->setEnabled(rda->user()->createLog()); log_add_button->setEnabled(rda->user()->createLog());
log_delete_button->setEnabled(rda->user()->deleteLog()); log_delete_button->setEnabled(false);
log_track_button->setEnabled(rda->user()->voicetrackLog()); log_track_button->setEnabled(false);
} }
@ -631,8 +631,8 @@ void MainWidget::logSelectionChangedData()
item=(ListListViewItem *)item->nextSibling(); item=(ListListViewItem *)item->nextSibling();
} }
log_edit_button->setEnabled(count==1); log_edit_button->setEnabled(count==1);
log_delete_button->setEnabled(count>0); log_delete_button->setEnabled(count>0&&rda->user()->deleteLog());
log_track_button->setEnabled(count==1); log_track_button->setEnabled(count==1&&rda->user()->voicetrackLog());
} }