Detect when the last page of comments has been reached.

2 files changed, 10 insertions, 5 deletions

diff --git a/bin/gtk-straw-viewer b/bin/gtk-straw-viewer
index 4e181b5..22e90b7 100755
--- a/bin/gtk-straw-viewer
+++ b/bin/gtk-straw-viewer
@@ -3382,7 +3382,7 @@ sub display_comments {
     my $url      = $results->{url};
     my $video_id = $results->{results}{videoId};
     my $comments = $results->{results}{comments} // [];
-    my $continuation = $results->{results}{continuation} // [];
+    my $continuation = $results->{results}{continuation};
 
     foreach my $comment (@{$comments}) {
 
diff --git a/bin/straw-viewer b/bin/straw-viewer
index f904e1d..b20fead 100755
--- a/bin/straw-viewer
+++ b/bin/straw-viewer
@@ -2273,9 +2273,14 @@ sub general_options {
         main_quit(0);
     }
     elsif ($option =~ /^(?:n|next)\z/ and defined $url) {
-        if (defined $token) {
-            my $request = $yv_obj->next_page_with_token($url, $token);
-            $callback->($request);
+        if (exists $args{token}) {
+            if (defined $token) {
+                my $request = $yv_obj->next_page_with_token($url, $token);
+                $callback->($request);
+            }
+            else {
+                warn_last_page();
+            }
         }
         else {
             my $request = $yv_obj->next_page($url);
@@ -2628,7 +2633,7 @@ sub print_comments {
 
     my $url      = $results->{url};
     my $comments = $results->{results}{comments} // [];
-    my $token = $results->{results}{continuation} // [];
+    my $token = $results->{results}{continuation};
 
     my $i = 0;
     foreach my $comment (@{$comments}) {