diff --git a/savepointradio/radio/models.py b/savepointradio/radio/models.py index 049fa4e..4a41b83 100644 --- a/savepointradio/radio/models.py +++ b/savepointradio/radio/models.py @@ -184,7 +184,9 @@ class Song(Disableable, Publishable, Timestampable, models.Model): Datetime when a song can be requested again. """ if self._is_song(): - return self.last_played + Song.music.wait_total() + if self.last_played: + return self.last_played + Song.music.wait_total() + return timezone.now() return None def _is_requestable(self):