mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2025-06-07 07:32:34 +02:00
2016-07-22 Fred Gleason <fredg@paravelsystems.com>
* Cleaned up warning in 'rdairplay/log_play.cpp'.
This commit is contained in:
parent
368c310a5e
commit
b257ba924c
@ -15403,3 +15403,5 @@
|
||||
a SQL error when logging ELR data.
|
||||
2016-07-22 Fred Gleason <fredg@paravelsystems.com>
|
||||
* Fixed a bug in 'rdairplay/log_play.cpp' that caused a SQL error.
|
||||
2016-07-22 Fred Gleason <fredg@paravelsystems.com>
|
||||
* Cleaned up warning in 'rdairplay/log_play.cpp'.
|
||||
|
@ -2255,27 +2255,30 @@ QTime LogPlay::GetStartTime(QTime sched_time,
|
||||
break;
|
||||
}
|
||||
switch(time_type) {
|
||||
case RDLogLine::Relative:
|
||||
if(!prev_time.isNull()) {
|
||||
*stop=false;
|
||||
return time;
|
||||
}
|
||||
*stop=true;
|
||||
return QTime();
|
||||
break;
|
||||
case RDLogLine::Relative:
|
||||
if(!prev_time.isNull()) {
|
||||
*stop=false;
|
||||
return time;
|
||||
}
|
||||
*stop=true;
|
||||
return QTime();
|
||||
break;
|
||||
|
||||
case RDLogLine::Hard:
|
||||
if((time<sched_time)||(time.isNull())) {
|
||||
*stop=true;
|
||||
}
|
||||
else {
|
||||
*stop=false;
|
||||
}
|
||||
if(running_events&&(time<sched_time)&&(trans_type!=RDLogLine::Stop)) {
|
||||
return time;
|
||||
}
|
||||
return sched_time;
|
||||
break;
|
||||
case RDLogLine::Hard:
|
||||
if((time<sched_time)||(time.isNull())) {
|
||||
*stop=true;
|
||||
}
|
||||
else {
|
||||
*stop=false;
|
||||
}
|
||||
if(running_events&&(time<sched_time)&&(trans_type!=RDLogLine::Stop)) {
|
||||
return time;
|
||||
}
|
||||
return sched_time;
|
||||
break;
|
||||
|
||||
case RDLogLine::NoTime:
|
||||
break;
|
||||
}
|
||||
return QTime();
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user