Merge branch 'release/debian/0.30.4-1'debian/0.30.4-1

1 files changed, 8 insertions, 0 deletions

diff --git a/src/SlideshowPage.vala b/src/SlideshowPage.vala
index 18fef7f..9810236 100644
--- a/src/SlideshowPage.vala
+++ b/src/SlideshowPage.vala
@@ -340,6 +340,12 @@ class SlideshowPage : SinglePhotoPage {
     public override bool key_press_event(Gdk.EventKey event) {
         bool handled = true;
         switch (Gdk.keyval_name(event.keyval)) {
+            // Block activating the toolbar on key down
+            // FIXME: Why is SinglePhotoPage not a PhotoPage which already does this?
+            case "Down":
+            case "KP_Down":
+                ;
+            break;
             case "space":
                 on_play_pause();
             break;
@@ -362,6 +368,7 @@ class SlideshowPage : SinglePhotoPage {
         bool slideshow_playing = playing;
         playing = false;
         hide_toolbar();
+        suspend_cursor_hiding();
         
         if (settings_dialog.run() == Gtk.ResponseType.OK) {
             // sync with the config setting so it will persist
@@ -375,6 +382,7 @@ class SlideshowPage : SinglePhotoPage {
         }
         
         settings_dialog.destroy();
+        restore_cursor_hiding();
         playing = slideshow_playing;
         timer.start();
     }