From 9531edfffc01363ee67dc0025919382498da3ddd Mon Sep 17 00:00:00 2001
From: Lynix <lynix680@gmail.com>
Date: Fri, 10 Mar 2017 17:07:40 +0100
Subject: [PATCH] Core/Signal: Fix move behaviour with GCC 4.9 ....

---
 include/Nazara/Core/Signal.inl | 38 ++++++++++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/include/Nazara/Core/Signal.inl b/include/Nazara/Core/Signal.inl
index 65df55712..d71388c94 100644
--- a/include/Nazara/Core/Signal.inl
+++ b/include/Nazara/Core/Signal.inl
@@ -246,6 +246,18 @@ namespace Nz
 	* \brief Core class that represents a connection attached to a signal
 	*/
 
+	/*!
+	* \brief Constructs a Signal::Connection object with by move semantic
+	*
+	* \param connection Connection object to move
+	*/
+	template<typename... Args>
+	Signal<Args...>::Connection::Connection(Connection&& connection) noexcept :
+	m_ptr(std::move(connection.m_ptr))
+	{
+		connection.m_ptr.reset(); //< Fuck you GCC 4.9
+	}
+	
 	/*!
 	* \brief Constructs a Signal::Connection object with a slot
 	*
@@ -294,6 +306,18 @@ namespace Nz
 		return !m_ptr.expired();
 	}
 
+	/*!
+	* \brief Constructs a Signal::ConnectionGuard object by move semantic
+	*
+	* \param connection Connection to move
+	*/
+	template<typename... Args>
+	typename Signal<Args...>::Connection& Signal<Args...>::Connection::operator=(Connection&& connection) noexcept
+	{
+		m_ptr = std::move(connection.m_ptr);
+		connection.m_ptr.reset(); //< Fuck you GCC 4.9
+	}
+	
 	/*!
 	* \class Nz::Signal::ConnectionGuard
 	* \brief Core class that represents a RAII for a connection attached to a signal
@@ -406,8 +430,11 @@ namespace Nz
 	template<typename... Args>
 	typename Signal<Args...>::ConnectionGuard& Signal<Args...>::ConnectionGuard::operator=(Connection&& connection)
 	{
-		m_connection.Disconnect();
-		m_connection = std::move(connection);
+		if (&connection != this)
+		{
+			m_connection.Disconnect();
+			m_connection = std::move(connection);
+		}
 
 		return *this;
 	}
@@ -422,8 +449,11 @@ namespace Nz
 	template<typename... Args>
 	typename Signal<Args...>::ConnectionGuard& Signal<Args...>::ConnectionGuard::operator=(ConnectionGuard&& connection) noexcept
 	{
-		m_connection.Disconnect();
-		m_connection = std::move(connection.m_connection);
+		if (&connection != this)
+		{
+			m_connection.Disconnect();
+			m_connection = std::move(connection.m_connection);
+		}
 
 		return *this;
 	}