Merge lp:~artem-anufrij/audience/return-to-library into lp:~audience-members/audience/trunk

[Artem Anufrij]

* Return to library when playback ends
* Fix a crash when playback ends

[lp:~artem-anufrij/audience/return-to-library]

661. By Artem Anufrij on 2016-09-23

fixed chrash

662. By Artem Anufrij on 2016-09-23

set uri to an empty string instead null

[Danielle Foré (danrabbit)]

Works for me. Navigates to the correct page, no crash, navigation buttons behave correctly.

review: Approve

=== modified file 'src/Widgets/PlayerPage.vala'
--- src/Widgets/PlayerPage.vala	2016-09-21 17:31:49 +0000
+++ src/Widgets/PlayerPage.vala	2016-09-23 16:17:36 +0000
@@ -273,7 +273,7 @@
         }
         
         public void reset_played_uri () {
-            playback.uri = null;
+            playback.uri = "";
         }
 
         public void next () {

=== modified file 'src/Window.vala'
--- src/Window.vala	2016-09-22 18:15:07 +0000
+++ src/Window.vala	2016-09-23 16:17:36 +0000
@@ -52,24 +52,7 @@
 
         navigation_button = new NavigationButton ();
         navigation_button.clicked.connect (() => {
-            double progress = player_page.get_progress ();
-            if (progress > 0) {
-                settings.last_stopped = progress;
-            }
-            player_page.playing = false;
-            player_page.reset_played_uri ();
-            title = App.get_instance ().program_name;
-            get_window ().set_cursor (null);
-            
-            if (navigation_button.label == navigation_button_library) {
-                navigation_button.label = navigation_button_welcomescreen;
-                main_stack.set_visible_child_full ("library", Gtk.StackTransitionType.SLIDE_RIGHT);
-            } else {
-                navigation_button.hide ();
-                main_stack.set_visible_child (welcome_page);
-            }
-            
-            welcome_page.refresh ();
+            navigate_back ();
         });
 
         header.pack_start (navigation_button);
@@ -370,10 +353,7 @@
     }
 
     private void on_player_ended () {
-        main_stack.set_visible_child (welcome_page);
-        welcome_page.refresh ();
-        title = App.get_instance ().program_name;
-        get_window ().set_cursor (null);
+        navigate_back ();
         unfullscreen ();
     }
 
@@ -397,4 +377,27 @@
         
         welcome_page.refresh ();
     }
+    
+    public void navigate_back () {
+        double progress = player_page.get_progress ();
+        if (progress > 0) {
+            settings.last_stopped = progress;
+        }
+        if (player_page.playing) {
+            player_page.playing = false;
+            player_page.reset_played_uri ();
+        }
+        title = App.get_instance ().program_name;
+        get_window ().set_cursor (null);
+        
+        if (navigation_button.label == navigation_button_library) {
+            navigation_button.label = navigation_button_welcomescreen;
+            main_stack.set_visible_child_full ("library", Gtk.StackTransitionType.SLIDE_RIGHT);
+        } else {
+            navigation_button.hide ();
+            main_stack.set_visible_child (welcome_page);
+        }
+        
+        welcome_page.refresh ();
+    }
 }