Fixed bug in ggsubseriesplot when labels provided

R/ggplot.R

@@ -1251,14 +1251,7 @@ ggsubseriesplot <- function(x, labels = NULL, times = time(x), phase = cycle(x),
 
     # Create x-axis labels
     xfreq <- frequency(x)
-    if (!is.null(labels)) {
-      if (xfreq != length(labels)) {
-        stop("The number of labels supplied is not the same as the number of seasons.")
-      } else {
-        xbreaks <- labels
-      }
-    }
-    else if (xfreq == 4) {
+    if (xfreq == 4) {
       xbreaks <- c("Q1", "Q2", "Q3", "Q4")
       xlab <- "Quarter"
     }
@@ -1277,6 +1270,13 @@ ggsubseriesplot <- function(x, labels = NULL, times = time(x), phase = cycle(x),
       xbreaks <- 1:frequency(x)
       xlab <- "Season"
     }
+    if (!is.null(labels)) {
+      if (xfreq != length(labels)) {
+        stop("The number of labels supplied is not the same as the number of seasons.")
+      } else {
+        xbreaks <- labels
+      }
+    }
 
     # X-axis
     p <- p + ggplot2::scale_x_continuous(breaks = 0.5 + (1:xfreq), labels = xbreaks)