Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2026-01-16 17:41:20 +01: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

14
rdlogmanager/edit_event.cpp
View File

@@ -31,14 +31,15 @@
#include "edit_event.h"
#include "edit_perms.h"
EditEvent::EditEvent(QString eventname,bool new_event,
std::vector<QString> *new_events,QWidget *parent)
EditEvent::EditEvent(QString eventname,bool new_event,QStringList *new_events,
QStringList *modified_events,QWidget *parent)
: RDDialog(parent)
{
event_saved=false;
event_name=eventname;
event_new_event=new_event;
event_new_events=new_events;
event_modified_events=modified_events;
event_event=new RDEvent(eventname);
setWindowTitle("RDLogManager - "+tr("Editing Event")+" - "+
@@ -1144,7 +1145,7 @@ void EditEvent::saveAsData()
old_name=event_name;
AddEvent *add_dialog=new AddEvent(&event_name,this);
if(add_dialog->exec()<0) {
if(!add_dialog->exec()) {
delete add_dialog;
return;
}
@@ -1165,8 +1166,9 @@ void EditEvent::saveAsData()
event_event->name());
}
else {
if(QMessageBox::question(this,tr("RDLogManager"),
tr("Event already exists!\nDo you want to overwrite it?"),
if(QMessageBox::question(this,"RDLogManager - "+tr("Event Exists"),
tr("An event with that name already exists!")+
"\n"+tr("Do you want to overwrite it?"),
QMessageBox::Yes,QMessageBox::No)!=
QMessageBox::Yes) {
return;
@@ -1174,7 +1176,7 @@ void EditEvent::saveAsData()
delete event_event;
event_event=new RDEvent(event_name,true);
Save();
event_new_events->push_back(event_name);
event_modified_events->push_back(event_name);
sql=QString("delete from `EVENT_PERMS` where ")+
"`EVENT_NAME`='"+RDEscapeString(event_name)+"'";
q=new RDSqlQuery(sql);