diff options
Diffstat (limited to 'menuApp')
| -rw-r--r-- | menuApp/src/dirscanner.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/menuApp/src/dirscanner.cpp b/menuApp/src/dirscanner.cpp index 942c352..5ba830b 100644 --- a/menuApp/src/dirscanner.cpp +++ b/menuApp/src/dirscanner.cpp @@ -71,7 +71,7 @@ void dirScanner::scan(){ int start = ofToInt(d.substr(0,4)); int end = ofToInt(d.substr(5,4)); - if (end){ + if (start||end){ slots.push_back(timeSlot(dir.getPath(i),start,end)); ofLogNotice() << "directory "<<i<<": "<<start<<" - "<<end<<" "<<dir.getPath(i); @@ -88,9 +88,17 @@ int dirScanner::getSlotForTime(){ int railwaytime=(ofGetHours()*100)+ofGetMinutes(); for(int i = 0; i < slots.size(); i++){ - if (slots[i].start<=railwaytime&&slots[i].end>=railwaytime){ - return i; + if (slots[i].start<slots[i].end){ + if (slots[i].start<=railwaytime&&slots[i].end>=railwaytime){ + return i; + } } + else { + if (slots[i].end>=railwaytime||slots[i].start<=railwaytime){ + return i; + } + } + } return -1; } |