mirror of
https://gitlab.com/pholy/OSCAR-code.git
synced 2025-04-07 03:30:44 +00:00
Merge branch 'master' into welcome
This commit is contained in:
commit
bd3c078dfb
@ -1344,7 +1344,7 @@ void ResDayTask::run()
|
|||||||
for (int i=0;i<resday->str.maskon.size();++i) {
|
for (int i=0;i<resday->str.maskon.size();++i) {
|
||||||
quint32 maskon = resday->str.maskon[i];
|
quint32 maskon = resday->str.maskon[i];
|
||||||
quint32 maskoff = resday->str.maskoff[i];
|
quint32 maskoff = resday->str.maskoff[i];
|
||||||
if ((maskon>0) && (maskoff>0)) {
|
if (((maskon>0) && (maskoff>0)) && (maskon != maskoff)) { //ignore very short sessions
|
||||||
Session * sess = new Session(mach, maskon);
|
Session * sess = new Session(mach, maskon);
|
||||||
sess->set_first(quint64(maskon) * 1000L);
|
sess->set_first(quint64(maskon) * 1000L);
|
||||||
sess->set_last(quint64(maskoff) * 1000L);
|
sess->set_last(quint64(maskoff) * 1000L);
|
||||||
|
Loading…
Reference in New Issue
Block a user