Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-17 16:11:12 +02:00
Code Issues Projects Releases Wiki Activity

2023-01-30 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug in the voice tracker widget that threw a segfault
	when the user attempted to select the '--- end of log ---' marker.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2023-01-30 12:28:33 -05:00
parent 0d38cc7224
commit d380a62903
2 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -23955,3 +23955,6 @@
2023-01-27 Fred Gleason <fredg@paravelsystems.com> 2023-01-27 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in rdcastmanager(1) that caused podcast items * Fixed a regression in rdcastmanager(1) that caused podcast items
to fail to be sorted chronologically by default. to fail to be sorted chronologically by default.
2023-01-30 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in the voice tracker widget that threw a segfault
when the user attempted to select the '--- end of log ---' marker.

24
lib/rdtrackerwidget.cpp
View File

@@ -3281,14 +3281,16 @@ void RDTrackerWidget::DrawRubberBand(RDWavePainter *wp,int trackno)
&& d_loglines[trackno]->segueStartPoint()<draw_fadedown_point && d_loglines[trackno]->segueStartPoint()<draw_fadedown_point
&& (!d_loaded)) { && (!d_loaded)) {
if(trackno<2) { if(trackno<2) {
if(d_loglines[trackno+1]->transType()==RDLogLine::Segue) { if((d_loglines[trackno+1]!=NULL)&&
(d_loglines[trackno+1]->transType()==RDLogLine::Segue)) {
draw_fadedown_point=d_loglines[trackno]->segueStartPoint(); draw_fadedown_point=d_loglines[trackno]->segueStartPoint();
draw_fadedown_gain=d_loglines[trackno]->segueGain(); draw_fadedown_gain=d_loglines[trackno]->segueGain();
} }
} }
} }
if(trackno<2) { if(trackno<2) {
if((d_loglines[trackno+1]->transType()==RDLogLine::Segue) if((d_loglines[trackno+1]!=NULL)&&
(d_loglines[trackno+1]->transType()==RDLogLine::Segue)
&& (!d_loaded)) { && (!d_loaded)) {
draw_end_point=d_loglines[trackno]->segueEndPoint(); draw_end_point=d_loglines[trackno]->segueEndPoint();
if(draw_fadedown_point>draw_end_point) { if(draw_fadedown_point>draw_end_point) {
@@ -3644,7 +3646,9 @@ void RDTrackerWidget::UpdateControls()
d_record_button->setText(tr("Record")); d_record_button->setText(tr("Record"));
d_track2_button->setDisabled(true); d_track2_button->setDisabled(true);
d_finished_button->setEnabled(d_changed); d_finished_button->setEnabled(d_changed);
d_reset_button->setEnabled(real_logline->hasCustomTransition()); if(real_logline!=NULL) {
d_reset_button->setEnabled(real_logline->hasCustomTransition());
}
d_post_button->setDisabled(true); d_post_button->setDisabled(true);
d_play_button->setEnabled(true); d_play_button->setEnabled(true);
d_stop_button->setEnabled(true); d_stop_button->setEnabled(true);
@@ -3814,6 +3818,7 @@ bool RDTrackerWidget::IsTrack(int line,bool *offset)
bool RDTrackerWidget::CanInsertTrack() bool RDTrackerWidget::CanInsertTrack()
{ {
int line; int line;
bool state=false;
if((line=SingleSelectionLine())<0) { if((line=SingleSelectionLine())<0) {
return false; return false;
@@ -3825,8 +3830,10 @@ bool RDTrackerWidget::CanInsertTrack()
return d_log_model->logLine(d_log_model->lineCount()-1)->type() return d_log_model->logLine(d_log_model->lineCount()-1)->type()
!=RDLogLine::Track; !=RDLogLine::Track;
} }
bool state=d_log_model->logLine(line)->type()==RDLogLine::Track; if(d_log_model->logLine(line)!=NULL) {
if(line>0) { state=d_log_model->logLine(line)->type()==RDLogLine::Track;
}
if((d_log_model->logLine(line-1)!=NULL)&&(line>0)) {
state=state|| state=state||
(d_log_model->logLine(line-1)->type()==RDLogLine::Track); (d_log_model->logLine(line-1)->type()==RDLogLine::Track);
} }
@@ -3838,11 +3845,16 @@ bool RDTrackerWidget::CanInsertTrack()
bool RDTrackerWidget::CanDeleteTrack() bool RDTrackerWidget::CanDeleteTrack()
{ {
int line=SingleSelectionLine(); int line=SingleSelectionLine();
bool ret=false;
if((line<0)||(line==TRACKER_MAX_LINENO)) { if((line<0)||(line==TRACKER_MAX_LINENO)) {
return false; return false;
} }
return d_log_model->logLine(line)->type()==RDLogLine::Track; if(d_log_model->logLine(line)!=NULL) {
ret=d_log_model->logLine(line)->type()==RDLogLine::Track;
}
return ret;
} }