From 83498463336b56a7ad5440060f7daa7723e04246 Mon Sep 17 00:00:00 2001 From: grorp Date: Wed, 4 Sep 2024 15:18:45 +0200 Subject: [PATCH] TouchControls: Fix setUseCrosshair not being called (#15100) --- src/client/game.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/client/game.cpp b/src/client/game.cpp index 0a9b4ec58..7213faafa 100644 --- a/src/client/game.cpp +++ b/src/client/game.cpp @@ -1510,10 +1510,6 @@ bool Game::createClient(const GameStartData &start_data) client->getScript()->on_camera_ready(camera); client->setCamera(camera); - if (g_touchcontrols) { - g_touchcontrols->setUseCrosshair(!isTouchCrosshairDisabled()); - } - /* Clouds */ if (m_cache_enable_clouds) @@ -1578,8 +1574,10 @@ bool Game::initGui() gui_chat_console = new GUIChatConsole(guienv, guienv->getRootGUIElement(), -1, chat_backend, client, &g_menumgr); - if (g_settings->getBool("touch_controls")) + if (g_settings->getBool("touch_controls")) { g_touchcontrols = new TouchControls(device, texture_src); + g_touchcontrols->setUseCrosshair(!isTouchCrosshairDisabled()); + } return true; }