From b6bdc6a3406e4171b3e46c3735b7801edd27dd67 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 29 Jun 2013 22:05:21 +0300
Subject: fix initialisation order in setup/video.

---
 src/gui/setup_video.cpp | 30 +++++++++++++++---------------
 src/gui/setup_video.h   |  6 +++---
 2 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'src')

diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 4e62d5445..14de7cb1a 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -211,20 +211,6 @@ Setup_Video::Setup_Video(const Widget2 *const widget) :
     // TRANSLATORS: video settings checkbox
     mFsCheckBox(new CheckBox(this, _("Full screen"), mFullScreenEnabled)),
     mOpenGLDropDown(new DropDown(widget, mOpenGLListModel)),
-    mCustomCursorCheckBox(new CheckBox(this,
-#ifdef ANDROID
-        // TRANSLATORS: video settings checkbox
-        _("Show cursor"),
-#else
-        // TRANSLATORS: video settings checkbox
-        _("Custom cursor"),
-#endif
-                          mCustomCursorEnabled)),
-    // TRANSLATORS: video settings checkbox
-    mEnableResizeCheckBox(new CheckBox(this, _("Enable resize"),
-                          mEnableResize)),
-    // TRANSLATORS: video settings checkbox
-    mNoFrameCheckBox(new CheckBox(this, _("No frame"), mNoFrame)),
     // TRANSLATORS: video settings checkbox
     mFpsCheckBox(new CheckBox(this, _("FPS limit:"))),
     mFpsSlider(new Slider(2, 160)),
@@ -239,7 +225,21 @@ Setup_Video::Setup_Video(const Widget2 *const widget) :
     mDialog(nullptr),
     mCustomCursorEnabled(config.getBoolValue("customcursor")),
     mEnableResize(config.getBoolValue("enableresize")),
-    mNoFrame(config.getBoolValue("noframe"))
+    mNoFrame(config.getBoolValue("noframe")),
+    mCustomCursorCheckBox(new CheckBox(this,
+#ifdef ANDROID
+        // TRANSLATORS: video settings checkbox
+        _("Show cursor"),
+#else
+        // TRANSLATORS: video settings checkbox
+        _("Custom cursor"),
+#endif
+                          mCustomCursorEnabled)),
+    // TRANSLATORS: video settings checkbox
+    mEnableResizeCheckBox(new CheckBox(this, _("Enable resize"),
+                          mEnableResize)),
+    // TRANSLATORS: video settings checkbox
+    mNoFrameCheckBox(new CheckBox(this, _("No frame"), mNoFrame))
 {
     // TRANSLATORS: video settings tab name
     setName(_("Video"));
diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h
index bd77e32b5..2c0224f06 100644
--- a/src/gui/setup_video.h
+++ b/src/gui/setup_video.h
@@ -64,9 +64,6 @@ class Setup_Video final : public SetupTab, public gcn::KeyListener
         ListBox *mModeList;
         CheckBox *mFsCheckBox;
         DropDown *mOpenGLDropDown;
-        CheckBox *mCustomCursorCheckBox;
-        CheckBox *mEnableResizeCheckBox;
-        CheckBox *mNoFrameCheckBox;
         CheckBox *mFpsCheckBox;
         Slider *mFpsSlider;
         Label *mFpsLabel;
@@ -79,6 +76,9 @@ class Setup_Video final : public SetupTab, public gcn::KeyListener
         bool mCustomCursorEnabled;
         bool mEnableResize;
         bool mNoFrame;
+        CheckBox *mCustomCursorCheckBox;
+        CheckBox *mEnableResizeCheckBox;
+        CheckBox *mNoFrameCheckBox;
 };
 
 #endif  // GUI_SETUP_VIDEO_H
-- 
cgit v1.2.3-70-g09d2