From 242f1ecfe2868bdd141e55f0c1b7dfcb790bb768 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Sun, 30 Jun 2019 23:19:06 +0200
Subject: [PATCH] Change to spectator mode after race end in multitouch gui.

Tested only on desktop, but should work on android too.
---
 src/karts/kart.cpp | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp
index b7a33e16c..2c1574b59 100644
--- a/src/karts/kart.cpp
+++ b/src/karts/kart.cpp
@@ -1369,7 +1369,6 @@ void Kart::update(int ticks)
         m_saved_controller = NULL;
     }
 
-#ifndef ANDROID
     auto cl = LobbyProtocol::get<ClientLobby>();
     // Enable spectate mode after 2 seconds which allow player to
     // release left / right button if they keep pressing it during
@@ -1385,16 +1384,26 @@ void Kart::update(int ticks)
         m_network_confirmed_finish_ticks + stk_config->time2Ticks(1.0f) &&
         !m_enabled_network_spectator)
     {
+        m_enabled_network_spectator = true;
+        cl->setSpectator(true);
+
         static bool msg_shown = false;
         if (!msg_shown)
         {
             msg_shown = true;
-            cl->addSpectateHelperMessage();
+
+            RaceGUIBase* m = World::getWorld()->getRaceGUI();
+
+            if (m->getMultitouchGUI() != NULL)
+            {
+                m->recreateMultitouchGUI();
+            }
+            else
+            {
+                cl->addSpectateHelperMessage();
+            }
         }
-        m_enabled_network_spectator = true;
-        cl->setSpectator(true);
     }
-#endif
 
     m_powerup->update(ticks);