ofTime: fix overflow when adding more than 2 seconds

#changelog #utils
openframeworks · Apr 9, 2019 · f7889ef · f7889ef
1 parent 521d763
commit f7889ef
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/libs/openFrameworks/utils/ofTimer.cpp b/libs/openFrameworks/utils/ofTimer.cpp
@@ -36,11 +36,11 @@ void ofTimer::waitNext(){
 	WaitForSingleObject(hTimer, INFINITE);
 #else
 	auto now = ofGetCurrentTime();
-	auto waitNanos = nextWakeTime - now;
-	if(waitNanos > std::chrono::nanoseconds(0)){
+	if(now < nextWakeTime){
+		auto waitNanos = nextWakeTime - now;
 		timespec waittime = (ofTime() + waitNanos).getAsTimespec();
-		timespec remainder;
-		nanosleep(&waittime,&remainder);
+		timespec remainder = {0,0};
+		nanosleep(&waittime, &remainder);
 	}
 #endif
 	calculateNextPeriod();

diff --git a/libs/openFrameworks/utils/ofUtils.h b/libs/openFrameworks/utils/ofUtils.h
@@ -113,8 +113,8 @@ struct ofTime{
 		auto ns = std::chrono::duration_cast<std::chrono::nanoseconds>(duration);
 		ofTime t = *this;
 		t.nanoseconds += ns.count();
-		if(this->nanoseconds>NANOS_PER_SEC){
-			uint64_t secs = this->nanoseconds / NANOS_PER_SEC;
+		if(t.nanoseconds>=NANOS_PER_SEC){
+			uint64_t secs = t.nanoseconds / NANOS_PER_SEC;
 			t.nanoseconds -= NANOS_PER_SEC*secs;
 			t.seconds+=secs;
 		}
@@ -126,7 +126,7 @@ struct ofTime{
 		constexpr uint64_t NANOS_PER_SEC = 1000000000ll;
 		auto ns = std::chrono::duration_cast<std::chrono::nanoseconds>(duration);
 		this->nanoseconds += ns.count();
-		if(this->nanoseconds>NANOS_PER_SEC){
+		if(this->nanoseconds>=NANOS_PER_SEC){
 			uint64_t secs = this->nanoseconds / NANOS_PER_SEC;
 			this->nanoseconds -= NANOS_PER_SEC*secs;
 			this->seconds+=secs;