Merge d9c66c6 into 2b440aa

UniversityRadioYork · Dec 29, 2020 · f6d4c6f · f6d4c6f
2 parents 2b440aa + d9c66c6
commit f6d4c6f
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/timeslot.go b/timeslot.go
@@ -211,12 +211,15 @@ func (s *Session) GetTimeslot(id int) (timeslot Timeslot, err error) {
 }
 
 // GetCurrentTimeslot retrieves the current timeslot.
+// If there is no show on air, returns the zero value for Timeslot.
 // This consumes one API request.
 func (s *Session) GetCurrentTimeslot() (timeslot Timeslot, err error) {
 	if err = s.get("/timeslot/currenttimeslot").Into(&timeslot); err != nil {
 		return
 	}
-	err = timeslot.populateTimeslotTimes()
+	if timeslot.TimeslotID != 0 {
+		err = timeslot.populateTimeslotTimes()
+	}
 	return
 }