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

2021-10-27 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a regression in rdlogmanager(1) in the 'Log Events' dialog
	that caused a 'phantom' additional entry in the event list to
	be created when overwriting an existing event during a 'Save As'
	operation.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2021-10-27 13:01:41 -04:00
parent e5e81ed361
commit 4a98b80c28
7 changed files with 45 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
rdlogmanager/list_events.cpp
View File

@@ -179,10 +179,11 @@ void ListEvents::addData()
RDEvent *event;
RDSqlQuery *q;
RDSqlQuery *q1;
std::vector<QString> new_events;
QStringList new_events;
QStringList modified_events;
AddEvent *add_dialog=new AddEvent(&logname,this);
if(add_dialog->exec()<0) {
if(!add_dialog->exec()) {
delete add_dialog;
return;
}
@@ -202,7 +203,8 @@ void ListEvents::addData()
delete q;
event=new RDEvent(logname,true);
delete event;
EditEvent *event_dialog=new EditEvent(logname,true,&new_events,this);
EditEvent *event_dialog=
new EditEvent(logname,true,&new_events,&modified_events,this);
if(event_dialog->exec()<-1) {
sql=QString("delete from `EVENTS` where ")+
"`NAME`='"+RDEscapeString(logname)+"'";
@@ -241,7 +243,10 @@ void ListEvents::addData()
}
}
delete event_dialog;
for(unsigned i=0;i<new_events.size();i++) {
for(int i=0;i<modified_events.size();i++) {
edit_events_model->refresh(modified_events.at(i));
}
for(int i=0;i<new_events.size();i++) {
QModelIndex row=edit_events_model->addEvent(new_events.at(i));
if(row.isValid()) {
edit_events_view->selectRow(row.row());
@@ -252,19 +257,23 @@ void ListEvents::addData()
void ListEvents::editData()
{
std::vector<QString> new_events;
QStringList new_events;
QStringList modified_events;
QModelIndexList rows=edit_events_view->selectionModel()->selectedRows();
if(rows.size()!=1) {
return;
}
EditEvent *event_dialog=
new EditEvent(edit_events_model->eventName(rows.first()),false,&new_events,
this);
new EditEvent(edit_events_model->eventName(rows.first()),false,
&new_events,&modified_events,this);
if(event_dialog->exec()>=-1) {
edit_events_model->refresh(rows.first());
}
for(unsigned i=0;i<new_events.size();i++) {
for(int i=0;i<modified_events.size();i++) {
edit_events_model->refresh(modified_events.at(i));
}
for(int i=0;i<new_events.size();i++) {
edit_events_model->addEvent(new_events.at(i));
}
delete event_dialog;