From d79f3de284ca94201fbeaa28e83cf37d8965ff71 Mon Sep 17 00:00:00 2001
From: tobias <thinkdifferent055@gmail.com>
Date: Sat, 28 Jan 2017 19:28:04 +0100
Subject: [PATCH] Fixed TouchMode Volume Slider, Search Feedback dialog

---
 .../playpad/layout/desktop/DesktopSearchController.java      | 1 +
 .../playpad/layout/touch/TouchMenuToolbarViewController.java | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopSearchController.java b/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopSearchController.java
index 92acef47..c9767d34 100644
--- a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopSearchController.java
+++ b/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopSearchController.java
@@ -50,6 +50,7 @@ public class DesktopSearchController implements EventHandler<ActionEvent> {
 
 		if (searchResult.isEmpty()) {
 			mainView.showInfoMessage(Localization.getString(Strings.Search_Alert_NoMatches), PlayPadMain.stageIcon.orElse(null));
+			return;
 		}
 
 		if (currentIndex < searchResult.size()) {
diff --git a/PlayWall/src/de/tobias/playpad/layout/touch/TouchMenuToolbarViewController.java b/PlayWall/src/de/tobias/playpad/layout/touch/TouchMenuToolbarViewController.java
index c3c5b6de..6564b534 100644
--- a/PlayWall/src/de/tobias/playpad/layout/touch/TouchMenuToolbarViewController.java
+++ b/PlayWall/src/de/tobias/playpad/layout/touch/TouchMenuToolbarViewController.java
@@ -43,6 +43,11 @@ public class TouchMenuToolbarViewController extends BasicMenuToolbarViewControll
 		icon.setSize(35);
 	}
 
+	@Override
+	public void init() {
+		volumeSlider.focusedProperty().addListener(i -> mainViewController.getParent().requestFocus());
+	}
+
 	@Override
 	public void initPageButtons() {
 		pageHBox.getChildren().clear();
-- 
GitLab