[ClientCommandHandler|LuaGUIState] Make sure only one GUI is active a…

…t the same time.
Unarelith · Jul 8, 2020 · 256700e · 256700e
1 parent 18d0fa8
commit 256700e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/source/client/network/ClientCommandHandler.cpp b/source/client/network/ClientCommandHandler.cpp
@@ -278,7 +278,8 @@ void ClientCommandHandler::setupCallbacks() {
 	});
 
 	m_client.setCommandCallback(Network::Command::BlockGUIData, [this](Network::Packet &packet) {
-		gk::ApplicationStateStack::getInstance().push<LuaGUIState>(*this, m_player, m_world, packet, &gk::ApplicationStateStack::getInstance().top());
+		if (!LuaGUIState::isActive)
+			gk::ApplicationStateStack::getInstance().push<LuaGUIState>(*this, m_player, m_world, packet, &gk::ApplicationStateStack::getInstance().top());
 	});
 
 	m_client.setCommandCallback(Network::Command::BlockInvUpdate, [this](Network::Packet &packet) {

diff --git a/source/client/states/LuaGUIState.cpp b/source/client/states/LuaGUIState.cpp
@@ -46,6 +46,8 @@
 #include "ScrollBarWidget.hpp"
 #include "TextButton.hpp"
 
+bool LuaGUIState::isActive = false;
+
 LuaGUIState::LuaGUIState(ClientCommandHandler &client, ClientPlayer &player, ClientWorld &world, sf::Packet &packet, gk::ApplicationState *parent)
 	: InterfaceState(parent), m_client(client), m_player(player), m_world(world)
 {
@@ -62,6 +64,8 @@ LuaGUIState::LuaGUIState(ClientCommandHandler &client, ClientPlayer &player, Cli
 
 	while (!packet.endOfPacket())
 		loadGUI(packet);
+
+	isActive = true;
 }
 
 void LuaGUIState::onEvent(const SDL_Event &event) {
@@ -75,6 +79,8 @@ void LuaGUIState::onEvent(const SDL_Event &event) {
 		gk::Mouse::setCursorVisible(false);
 		gk::Mouse::resetToWindowCenter();
 
+		isActive = false;
+
 		m_stateStack->pop();
 	}
 

diff --git a/source/client/states/LuaGUIState.hpp b/source/client/states/LuaGUIState.hpp
@@ -48,6 +48,8 @@ class LuaGUIState : public InterfaceState {
 
 		void update() override;
 
+		static bool isActive;
+
 	private:
 		void draw(gk::RenderTarget &target, gk::RenderStates states) const override;