From b6f72a52c7a000f146c5aff3ab8318293cbb1c42 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 14 Feb 2016 21:52:48 +0300
Subject: Fix crash in setup input page with name gui.

---
 src/gui/setupinputpages.cpp          |  6 ++++--
 src/gui/widgets/tabs/setup_input.cpp | 10 +++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'src/gui')

diff --git a/src/gui/setupinputpages.cpp b/src/gui/setupinputpages.cpp
index 32efcecdb..dbb05e4d5 100644
--- a/src/gui/setupinputpages.cpp
+++ b/src/gui/setupinputpages.cpp
@@ -21,6 +21,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "const/gui/pages.h"
+
 #include "gui/setupinputpages.h"
 
 #include "utils/gettext.h"
@@ -38,7 +40,7 @@
 
 #include "debug.h"
 
-const char *const pages[] =
+const char *const pages[SETUP_PAGES + 1] =
 {
     // TRANSLATORS: input tab sub tab name
     N_("Basic"),
@@ -63,7 +65,7 @@ const char *const pages[] =
     nullptr
 };
 
-SetupActionData *const setupActionData[] =
+SetupActionData *const setupActionData[SETUP_PAGES] =
 {
     setupActionDataBasic,
     setupActionDataMove,
diff --git a/src/gui/widgets/tabs/setup_input.cpp b/src/gui/widgets/tabs/setup_input.cpp
index 50187cffd..545952e2d 100644
--- a/src/gui/widgets/tabs/setup_input.cpp
+++ b/src/gui/widgets/tabs/setup_input.cpp
@@ -25,6 +25,8 @@
 
 #include "configuration.h"
 
+#include "const/gui/pages.h"
+
 #include "input/inputactionoperators.h"
 #include "input/inputmanager.h"
 #include "input/keyboardconfig.h"
@@ -55,8 +57,6 @@
 
 #include "debug.h"
 
-static const int setupGroups = 9;
-
 Setup_Input::Setup_Input(const Widget2 *const widget) :
     SetupTab(widget),
     mKeyListModel(new KeyListModel),
@@ -73,7 +73,7 @@ Setup_Input::Setup_Input(const Widget2 *const widget) :
     mScrollArea(new ScrollArea(this, mKeyList,
         true, "setup_input_background.xml")),
     mKeySetting(false),
-    mActionDataSize(new int [9])
+    mActionDataSize(new int [SETUP_PAGES])
 {
     inputManager.setSetupInput(this);
     // TRANSLATORS: setting tab name
@@ -81,7 +81,7 @@ Setup_Input::Setup_Input(const Widget2 *const widget) :
 
     mKeyListModel->setSelectedData(0);
 
-    for (int f = 0; f < setupGroups; f ++)
+    for (int f = 0; f < SETUP_PAGES; f ++)
     {
         int cnt = 0;
         while (!setupActionData[f][cnt].name.empty())
@@ -320,7 +320,7 @@ int Setup_Input::keyToSetupData(const InputActionT index) const
 
 std::string Setup_Input::keyToString(const InputActionT index) const
 {
-    for (int f = 0; f < setupGroups; f ++)
+    for (int f = 0; f < SETUP_PAGES; f ++)
     {
         for (int i = 0; i < mActionDataSize[f]; i++)
         {
-- 
cgit v1.2.3-60-g2f50