From 0903b8f586e358800872276212c266b6619b3818 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Wed, 12 Jul 2023 13:08:54 -0400 Subject: [PATCH] 2023-07-12 Fred Gleason * Fixed a fencepost bug in the 'Render Log' dialog in rdlogedit(1) that caused rendered log to include the cart immediately after the end of the selected section when setting the 'Include' dropdown to 'Only Selected Events'. Signed-off-by: Fred Gleason --- ChangeLog | 5 +++++ rdlogedit/edit_log.cpp | 2 +- rdlogedit/render_dialog.cpp | 5 ++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 54597c10..50279943 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24289,3 +24289,8 @@ * Fixed a regression in rdlogmanager(1) to caused the pie chart to fail to be drawn correctly upon first displaying the 'Edit Clock' dialog. +2023-07-12 Fred Gleason + * Fixed a fencepost bug in the 'Render Log' dialog in rdlogedit(1) + that caused rendered log to include the cart immediately after the + end of the selected section when setting the 'Include' dropdown to + 'Only Selected Events'. diff --git a/rdlogedit/edit_log.cpp b/rdlogedit/edit_log.cpp index f7dfd6be..cc4abe10 100644 --- a/rdlogedit/edit_log.cpp +++ b/rdlogedit/edit_log.cpp @@ -1028,7 +1028,7 @@ void EditLog::renderasData() } else { edit_render_dialog->exec(rda->user(),edit_log_model,rows.first().row(), - 1+rows.last().row()); + rows.last().row()); } } diff --git a/rdlogedit/render_dialog.cpp b/rdlogedit/render_dialog.cpp index 1155f46f..f57a24c9 100644 --- a/rdlogedit/render_dialog.cpp +++ b/rdlogedit/render_dialog.cpp @@ -2,7 +2,7 @@ // // Render Log Dialog for Rivendell. // -// (C) Copyright 2017-2021 Fred Gleason +// (C) Copyright 2017-2023 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -295,16 +295,19 @@ void RenderDialog::renderData() QMessageBox::warning(this,"RDLogEdit - "+tr("Rendering Error"), err_msg); delete r; + render_progress_dialog->reset(); return; } delete r; + render_progress_dialog->reset(); done(true); } void RenderDialog::cancelData() { + render_progress_dialog->reset(); done(false); }