amuse.git

diff --git a/datastructure/tvqueue.go b/datastructure/tvqueue.go
index cfb4a96cd659d1c9647c0b5e9d0bc1838c45d50f..116c866779774a09bb2d2d5b100d9d009eb3a1b0 100644
--- a/datastructure/tvqueue.go
+++ b/datastructure/tvqueue.go
@@ -24,7 +24,7 @@ func (e TvQueueEntry) GetYears() string {
 	if e.YearStart == 0 {
 		return ""
 	} else if e.Status == "Ended" || e.Status == "Canceled" {
-		if e.YearEnd == e.YearStart {
+		if e.YearEnd == e.YearStart || e.YearEnd == 0 {
 			return strconv.FormatInt(int64(e.YearStart), 10)
 		} else {
 			return strconv.FormatInt(int64(e.YearStart), 10) + "–" + strconv.FormatInt(int64(e.YearEnd), 10)




diff --git a/templates/watchlist.html b/templates/watchlist.html
index 09551dc1d3aa446ba9ebb1a1d2056cb9bc869bac..943d01daa092f0949abafb938b3068c65ab71023 100644
--- a/templates/watchlist.html
+++ b/templates/watchlist.html
@@ -67,7 +67,9 @@ 							{{end}}
 						</div>
 						<div class="margin-lr-1">
 							<p class="sans">{{.Title}}</p>
+							{{if gt .YearStart 1}}
 							<p class="sans font-_875 text-grey">{{.YearStart}}</p>
+							{{end}}
 							<p class="sans font-_875">
 								{{.GetGenres $.Data.Genres}}
 							</p>




diff --git a/tmdb/serie.go b/tmdb/serie.go
index 6bcde322b8470abecfaaaa0ac9fa04d3a9d02155..6c7528fd31239f054b0ce6baf7e7c1fead11a74e 100644
--- a/tmdb/serie.go
+++ b/tmdb/serie.go
@@ -132,7 +132,7 @@ func (s TvSerie) GetYears() string {
 	if s.First_air_date.IsZero() {
 		return ""
 	} else if s.Status == "Ended" || s.Status == "Canceled" {
-		if s.Last_air_date.Year() == s.First_air_date.Year() {
+		if s.Last_air_date.Year() == s.First_air_date.Year() || s.Last_air_date.IsZero() {
 			return strconv.FormatInt(int64(s.First_air_date.Year()), 10)
 		} else {
 			return strconv.FormatInt(int64(s.First_air_date.Year()), 10) + "–" + strconv.FormatInt(int64(s.Last_air_date.Year()), 10)