From e5b4121aef179e7b425330b04205e5cecb1dd827 Mon Sep 17 00:00:00 2001
From: Flakebi <flakebi@t-online.de>
Date: Tue, 27 May 2014 16:15:19 +0200
Subject: [PATCH] Fix behaviour of device-screen: Go to input-screen if
 pressing on the back button

---
 src/states_screens/options_screen_input2.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/states_screens/options_screen_input2.cpp b/src/states_screens/options_screen_input2.cpp
index 58123bff7..b9a0beaf3 100644
--- a/src/states_screens/options_screen_input2.cpp
+++ b/src/states_screens/options_screen_input2.cpp
@@ -320,7 +320,7 @@ void OptionsScreenInput2::updateInputButtons()
         getWidget<GUIEngine::LabelWidget>("conflict");
     if (conflicts)
         conflict_label->setText(
-           _("* A blue item means a conflict with another configuration") );
+           _("* A red item means a conflict with another configuration") );
     else
         conflict_label->setText("");
 
@@ -453,7 +453,7 @@ void OptionsScreenInput2::eventCallback(Widget* widget,
     }
     else if (name == "back")
     {
-        sm->popMenu();
+        sm->replaceTopMostScreen(OptionsScreenInput::getInstance());
     }
     else if (name == "actions")
     {