diff --git a/ChangeLog b/ChangeLog index 7d660980..3f4d2bc3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23797,3 +23797,7 @@ * Cleaned up filtering SQL in 'RDLogListModel'. 2022-12-13 Fred Gleason * Cleaned up filtering SQL in 'RDFeedListModel'. +2022-12-13 Fred Gleason + * Fixed a regression in rdlogedit(1) that caused a newly inserted + log event to be assigned the start time parameters of the previously + edited event. diff --git a/lib/rdlibrarymodel.cpp b/lib/rdlibrarymodel.cpp index 5a9aabdc..09678e4e 100644 --- a/lib/rdlibrarymodel.cpp +++ b/lib/rdlibrarymodel.cpp @@ -573,8 +573,6 @@ void RDLibraryModel::setFilterSql(const QString &sql,int cart_limit) void RDLibraryModel::processNotification(RDNotification *notify) { - printf("RDLibraryModel::processNotification()\n"); - QString sql; RDSqlQuery *q=NULL; diff --git a/lib/rdlog_line.cpp b/lib/rdlog_line.cpp index 0599f5b7..3317e3d1 100644 --- a/lib/rdlog_line.cpp +++ b/lib/rdlog_line.cpp @@ -119,7 +119,7 @@ void RDLogLine::clear() log_source=RDLogLine::Manual; log_cart_number=0; for(int i=0;i<5;i++) { - log_start_time[i]=QTime(); + log_start_time[i]=QTime(0,0,0); } log_time_type=RDLogLine::Relative; log_origin_user=""; diff --git a/rdlogedit/edit_event.cpp b/rdlogedit/edit_event.cpp index 569771c5..d6aa2c38 100644 --- a/rdlogedit/edit_event.cpp +++ b/rdlogedit/edit_event.cpp @@ -106,13 +106,8 @@ EditEvent::EditEvent(QWidget *parent) int EditEvent::exec() { edit_time_edit->setTime(edit_logline->startTime(RDLogLine::Logged)); - if(edit_logline->timeType()==RDLogLine::Hard) { - edit_timetype_box->setChecked(true); - timeToggledData(true); - } - else { - timeToggledData(false); - } + edit_timetype_box->setChecked(edit_logline->timeType()==RDLogLine::Hard); + timeToggledData(edit_logline->timeType()==RDLogLine::Hard); timeChangedData(edit_time_edit->time()); switch(edit_logline->graceTime()) { case -1: diff --git a/rdlogedit/edit_log.cpp b/rdlogedit/edit_log.cpp index e3e3483b..a987b2fc 100644 --- a/rdlogedit/edit_log.cpp +++ b/rdlogedit/edit_log.cpp @@ -677,13 +677,13 @@ void EditLog::insertCartButtonData() edit_log_model->insert(line,1); edit_log_model->logLine(line)->setTransType(edit_default_trans); - edit_log_model->logLine(line)->setFadeupGain(-3000); - edit_log_model->logLine(line)->setFadedownGain(-3000); + int ret=edit_logline_dialog-> exec(edit_service_box->currentText(),edit_log_model, edit_log_model->logLine(line),line); if(ret>=0) { edit_log_model->update(line); + timestyleChangedData(global_start_time_style); SetLogModified(true); } else {