Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-11-04 16:14:03 +01:00
Code Issues Projects Releases Wiki Activity

2022-03-25 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Reverted the following changes:
	2022-03-09 Fred Gleason <fredg@paravelsystems.com>
 	  * Fixed a regression in rdlogedit(1) that caused events from
	  previously viewed logs to be prepended to subsequent logs viewed
	  during the same session.
	2022-03-09 Fred Gleason <fredg@paravelsystems.com>
	  * Refactored the 'RDAddLog' dialog to allow for instance reuse.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2022-03-25 12:04:39 -04:00
parent 672bd74a7c
commit 2fbc9681b4
25 changed files with 132 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/rdsvc.cpp
View File

@@ -1008,10 +1008,8 @@ bool RDSvc::linkLog(RDSvc::ImportSource src,const QDate &date,
//
// Iterate Through the Log
//
src_model=new RDLogModel(true,this);
src_model->setLogName(logname);
dst_model=new RDLogModel(true,this);
dst_model->setLogName(logname);
src_model=new RDLogModel(logname,true,this);
dst_model=new RDLogModel(logname,true,this);
src_model->load();
for(int i=0;i<src_model->lineCount();i++) {
logline=src_model->logLine(i);
@@ -1165,10 +1163,8 @@ bool RDSvc::clearLogLinks(RDSvc::ImportSource src,const QString &logname,
break;
}
RDLogModel *src_model=new RDLogModel(false,this);
src_model->setLogName(logname);
RDLogModel *dst_model=new RDLogModel(false,this);
dst_model->setLogName(logname);
RDLogModel *src_model=new RDLogModel(logname,false,this);
RDLogModel *dst_model=new RDLogModel(logname,false,this);
src_model->load();
RDLogLine *logline=NULL;
for(int i=0;i<src_model->lineCount();i++) {
@@ -1814,8 +1810,7 @@ bool RDSvc::ResolveInlineEvents(const QString &logname,QString *err_msg)
switch(subEventInheritance()) {
case RDSvc::ParentEvent:
model=new RDLogModel(false,this);
model->setLogName(logname);
model=new RDLogModel(logname,false,this);
model->load();
ok=true;
for(int i=0;i<model->lineCount();i++) {