From a6bcc68cb48cc67469e9bcbd74b4d1a93a80f1f5 Mon Sep 17 00:00:00 2001 From: delvh Date: Sat, 10 Oct 2020 14:27:17 +0200 Subject: [PATCH] Fix merge error --- .../java/envoy/client/data/shortcuts/EnvoyShortcutConfig.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/src/main/java/envoy/client/data/shortcuts/EnvoyShortcutConfig.java b/client/src/main/java/envoy/client/data/shortcuts/EnvoyShortcutConfig.java index d829597..fe5db8f 100644 --- a/client/src/main/java/envoy/client/data/shortcuts/EnvoyShortcutConfig.java +++ b/client/src/main/java/envoy/client/data/shortcuts/EnvoyShortcutConfig.java @@ -5,6 +5,7 @@ import javafx.scene.input.*; import envoy.client.data.Context; import envoy.client.helper.ShutdownHelper; import envoy.client.ui.SceneContext.SceneInfo; +import envoy.client.util.UserUtil; /** * Envoy-specific implementation of the keyboard-shortcut interaction offered by @@ -30,7 +31,7 @@ public class EnvoyShortcutConfig { // Add the option to logout using "Control"+"Shift"+"L" if not in login scene instance.addForNotExcluded(new KeyCodeCombination(KeyCode.L, KeyCombination.CONTROL_DOWN, KeyCombination.SHIFT_DOWN), - ShutdownHelper::logout, + UserUtil::logout, SceneInfo.LOGIN_SCENE); // Add option to open settings scene with "Control"+"S", if not in login scene