Fix dig & place not being released when switching touch -> mouse

src/client/inputhandler.cpp

@@ -128,9 +128,9 @@ bool MyEventReceiver::OnEvent(const SEvent &event)
 
 	if (g_touchscreengui_tsrc && g_last_pointer_type == PointerType::Mouse &&
 			g_touchscreengui) {
-		g_touchscreengui->hide();
-		delete g_touchscreengui;
+		TouchScreenGUI *gui = g_touchscreengui;
 		g_touchscreengui = nullptr;
+		delete gui;
 	} else if (g_touchscreengui_tsrc && g_last_pointer_type == PointerType::Touch &&
 			!g_touchscreengui) {
 		g_touchscreengui = new TouchScreenGUI(RenderingEngine::get_raw_device(),

src/gui/touchscreengui.cpp

@@ -515,6 +515,11 @@ TouchScreenGUI::TouchScreenGUI(IrrlichtDevice *device, ISimpleTextureSource *tsr
 	}
 }
 
+TouchScreenGUI::~TouchScreenGUI()
+{
+	releaseAll();
+}
+
 void TouchScreenGUI::addButton(touch_gui_button_id id, const std::string &image, const recti &rect)
 {
 	IGUIImage *btn_gui_button = m_guienv->addImage(rect, nullptr, id);
@@ -796,6 +801,23 @@ void TouchScreenGUI::applyJoystickStatus()
 	}
 }
 
+void TouchScreenGUI::releaseAll()
+{
+	while (!m_pointer_pos.empty())
+		handleReleaseEvent(m_pointer_pos.begin()->first);
+
+	// Release those manually too since the change initiated by
+	// handleReleaseEvent will only be applied later by applyContextControls.
+	if (m_dig_pressed) {
+		emitMouseEvent(EMIE_LMOUSE_LEFT_UP);
+		m_dig_pressed = false;
+	}
+	if (m_place_pressed) {
+		emitMouseEvent(EMIE_RMOUSE_LEFT_UP);
+		m_place_pressed = false;
+	}
+}
+
 void TouchScreenGUI::step(float dtime)
 {
 	// simulate keyboard repeats
@@ -853,10 +875,8 @@ void TouchScreenGUI::setVisible(bool visible)
 	if (m_joystick_btn_off)
 		m_joystick_btn_off->setVisible(visible);
 
-	// clear all active buttons
 	if (!visible) {
-		while (!m_pointer_pos.empty())
-			handleReleaseEvent(m_pointer_pos.begin()->first);
+		releaseAll();
 		for (AutoHideButtonBar &bar : m_buttonbars) {
 			bar.deactivate();
 			bar.hide();

src/gui/touchscreengui.h

@@ -33,6 +33,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "itemdef.h"
 #include "client/game.h"
+#include "util/basic_macros.h"
 
 using namespace irr;
 using namespace irr::core;
@@ -187,6 +188,8 @@ class TouchScreenGUI
 {
 public:
 	TouchScreenGUI(IrrlichtDevice *device, ISimpleTextureSource *tsrc);
+	~TouchScreenGUI();
+	DISABLE_CLASS_COPY(TouchScreenGUI);
 
 	void translateEvent(const SEvent &event);
 	void applyContextControls(const TouchInteractionMode &mode);
@@ -295,6 +298,9 @@ class TouchScreenGUI
 	// apply joystick status
 	void applyJoystickStatus();
 
+	// release all buttons etc.
+	void releaseAll();
+
 	// map to store the IDs and original positions of currently pressed pointers
 	std::unordered_map<size_t, v2s32> m_pointer_downpos;
 	// map to store the IDs and positions of currently pressed pointers