Merge lp:~jeremywootten/audience/fix-keyboard-open-when-no-file into lp:~audience-members/audience/trunk

[Jeremy Wootten]

Do not resume when no current video & corrected "Spacebar" behavior

If there is no last played video in settings and if the "Space" key or "p" key is pressed at the Welcome page then audience shows a blank window. This branch fixes this bug. When there is no current video then resume_last_video () launches the file chooser.

[Felipe Escoto (philip.scott)]

Fixes this, and pressing Space skiping the video!

review: Approve

=== modified file 'src/Window.vala'
--- src/Window.vala	2016-03-19 19:19:13 +0000
+++ src/Window.vala	2016-06-12 13:09:12 +0000
@@ -100,10 +100,6 @@
             case Gdk.Key.o:
                 run_open_file ();
                 return true;
-            case Gdk.Key.p:
-            case Gdk.Key.space:
-                resume_last_videos ();
-                return true;
             case Gdk.Key.q:
                 destroy ();
                 return true;
@@ -184,6 +180,13 @@
                 default:
                     break;
             }
+        } else {
+            switch (e.keyval) {
+                case Gdk.Key.p:
+                case Gdk.Key.space:
+                    resume_last_videos ();
+                return true;
+            }
         }
 
         return false;
@@ -234,7 +237,11 @@
     }
 
     public void resume_last_videos () {
-        play_file (settings.current_video, false);
+        if (settings.current_video != "") {
+            play_file (settings.current_video, false);
+        } else {
+            run_open_file ();
+        }
     }
 
     public void run_open_dvd () {