Index: ps/trunk/source/gui/GUIManager.h =================================================================== --- ps/trunk/source/gui/GUIManager.h +++ ps/trunk/source/gui/GUIManager.h @@ -83,11 +83,6 @@ Status ReloadChangedFile(const VfsPath& path); /** - * Sets the default mouse pointer. - */ - void ResetCursor(); - - /** * Called when we should reload all pages (e.g. translation hotloading update). */ Status ReloadAllPages(); Index: ps/trunk/source/gui/GUIManager.cpp =================================================================== --- ps/trunk/source/gui/GUIManager.cpp +++ ps/trunk/source/gui/GUIManager.cpp @@ -105,8 +105,6 @@ // another GUI page on init which should be pushed on top of this new page. m_PageStack.emplace_back(pageName, initData); m_PageStack.back().LoadPage(m_ScriptRuntime); - - ResetCursor(); } void CGUIManager::PopPage(shared_ptr args) @@ -142,6 +140,7 @@ hotloadData = scriptInterface->WriteStructuredClone(hotloadDataVal); } + g_CursorName = g_DefaultCursor; inputs.clear(); gui.reset(new CGUI(scriptRuntime)); @@ -285,11 +284,6 @@ return INFO::OK; } -void CGUIManager::ResetCursor() -{ - g_CursorName = g_DefaultCursor; -} - InReaction CGUIManager::HandleEvent(const SDL_Event_* ev) { // We want scripts to have access to the raw input events, so they can do complex Index: ps/trunk/source/gui/Scripting/JSInterface_GUIManager.cpp =================================================================== --- ps/trunk/source/gui/Scripting/JSInterface_GUIManager.cpp +++ ps/trunk/source/gui/Scripting/JSInterface_GUIManager.cpp @@ -82,7 +82,7 @@ void JSI_GUIManager::ResetCursor(ScriptInterface::CxPrivate* UNUSED(pCxPrivate)) { - g_GUI->ResetCursor(); + g_CursorName = g_DefaultCursor; } bool JSI_GUIManager::TemplateExists(ScriptInterface::CxPrivate* UNUSED(pCxPrivate), const std::string& templateName)