From 65363a2fa001d4359d113eaeb46e5ab02a1e53a1 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Tue, 29 Aug 2017 21:02:12 +0200
Subject: [PATCH] Move multitouch race gui creation.

It's to avoid duplicated buttons because result gui uses gui_base too.
---
 src/states_screens/race_gui.cpp           | 8 ++++++++
 src/states_screens/race_gui_base.cpp      | 8 --------
 src/states_screens/race_gui_overworld.cpp | 8 ++++++++
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/states_screens/race_gui.cpp b/src/states_screens/race_gui.cpp
index a052c7a92..3c69d9833 100644
--- a/src/states_screens/race_gui.cpp
+++ b/src/states_screens/race_gui.cpp
@@ -87,6 +87,13 @@ RaceGUI::RaceGUI()
     const float map_size = 100.0f;
     const float top_margin = 3.5f * m_font_height;
     
+    if (UserConfigParams::m_multitouch_enabled && 
+        UserConfigParams::m_multitouch_mode != 0 &&
+        race_manager->getNumLocalPlayers() == 1)
+    {
+        m_multitouch_gui = new RaceGUIMultitouch(this);
+    }
+    
     // Check if we have enough space for minimap when touch steering is enabled
     if (m_multitouch_gui != NULL)
     {
@@ -139,6 +146,7 @@ RaceGUI::RaceGUI()
 //-----------------------------------------------------------------------------
 RaceGUI::~RaceGUI()
 {
+    delete m_multitouch_gui;
 }   // ~Racegui
 
 
diff --git a/src/states_screens/race_gui_base.cpp b/src/states_screens/race_gui_base.cpp
index f89eda495..75b519ad7 100644
--- a/src/states_screens/race_gui_base.cpp
+++ b/src/states_screens/race_gui_base.cpp
@@ -101,13 +101,6 @@ RaceGUIBase::RaceGUIBase()
 
     m_referee               = NULL;
     m_multitouch_gui        = NULL;
-
-    if (UserConfigParams::m_multitouch_enabled && 
-        UserConfigParams::m_multitouch_mode != 0 &&
-        race_manager->getNumLocalPlayers() == 1)
-    {
-        m_multitouch_gui = new RaceGUIMultitouch(this);
-    }
 }   // RaceGUIBase
 
 // ----------------------------------------------------------------------------
@@ -173,7 +166,6 @@ RaceGUIBase::~RaceGUIBase()
     // If the referee is currently being shown,
     // remove it from the scene graph.
     delete m_referee;
-    delete m_multitouch_gui;
 }   // ~RaceGUIBase
 
 //-----------------------------------------------------------------------------
diff --git a/src/states_screens/race_gui_overworld.cpp b/src/states_screens/race_gui_overworld.cpp
index 9a1ce79eb..c2d8b0099 100644
--- a/src/states_screens/race_gui_overworld.cpp
+++ b/src/states_screens/race_gui_overworld.cpp
@@ -86,6 +86,13 @@ RaceGUIOverworld::RaceGUIOverworld()
 
     float scaling = irr_driver->getFrameSize().Height / 420.0f;
     const float map_size = 250.0f;
+    
+    if (UserConfigParams::m_multitouch_enabled && 
+        UserConfigParams::m_multitouch_mode != 0 &&
+        race_manager->getNumLocalPlayers() == 1)
+    {
+        m_multitouch_gui = new RaceGUIMultitouch(this);
+    }
 
     // Check if we have enough space for minimap when touch steering is enabled
     if (m_multitouch_gui != NULL)
@@ -156,6 +163,7 @@ RaceGUIOverworld::RaceGUIOverworld()
 //-----------------------------------------------------------------------------
 RaceGUIOverworld::~RaceGUIOverworld()
 {
+    delete m_multitouch_gui;
 }   // ~RaceGUIOverworld
 
 //-----------------------------------------------------------------------------