diff --git a/Source/Core/Core/NetPlayServer.cpp b/Source/Core/Core/NetPlayServer.cpp
index a84373c271..85041efb24 100644
--- a/Source/Core/Core/NetPlayServer.cpp
+++ b/Source/Core/Core/NetPlayServer.cpp
@@ -114,15 +114,8 @@ void NetPlayServer::ThreadFunc()
 	}
 
 	// close listening socket and client sockets
-	{
-	std::map<sf::SocketTCP, Client>::reverse_iterator
-		i = m_players.rbegin(),
-		e = m_players.rend();
-	for ( ; i!=e; ++i)
-		i->second.socket.Close();
-	}
-
-	return;
+	for (auto& player_entry : m_players)
+		player_entry.second.socket.Close();
 }
 
 // called from ---NETPLAY--- thread