From 890e5c75d6ff760f30122d2f0a24ef9aa70154e3 Mon Sep 17 00:00:00 2001 From: Lynix Date: Tue, 10 Nov 2015 12:17:30 +0100 Subject: [PATCH] Network/AbstractSocket: Update OnStateChange signal Now it is called before the state changes really Former-commit-id: 3eec47302a971d798e1a75415377243bd743ce3f --- include/Nazara/Network/AbstractSocket.hpp | 2 +- include/Nazara/Network/AbstractSocket.inl | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/Nazara/Network/AbstractSocket.hpp b/include/Nazara/Network/AbstractSocket.hpp index 8c9fa5df5..9062fbfa8 100644 --- a/include/Nazara/Network/AbstractSocket.hpp +++ b/include/Nazara/Network/AbstractSocket.hpp @@ -36,7 +36,7 @@ namespace Nz unsigned int QueryAvailableBytes() const; // Slots - NazaraSignal(OnStateChange, const AbstractSocket* /*socket*/, SocketState /*oldState*/, SocketState /*newState*/); + NazaraSignal(OnStateChange, const AbstractSocket* /*socket*/, SocketState /*newState*/); protected: AbstractSocket(SocketType type); diff --git a/include/Nazara/Network/AbstractSocket.inl b/include/Nazara/Network/AbstractSocket.inl index cf75726b0..ffb33f093 100644 --- a/include/Nazara/Network/AbstractSocket.inl +++ b/include/Nazara/Network/AbstractSocket.inl @@ -35,9 +35,8 @@ namespace Nz { if (m_state != newState) { - SocketState oldState = m_state; + OnStateChange(this, m_state); m_state = newState; - OnStateChange(this, oldState, m_state); } } }