diff options
author | Jared Adams <jaxad0127@gmail.com> | 2009-11-03 11:22:31 -0700 |
---|---|---|
committer | Jared Adams <jaxad0127@gmail.com> | 2009-11-03 11:22:31 -0700 |
commit | e2897e4a7cb7eb0c4a7e46d72a9a19b909368c26 (patch) | |
tree | c63e0cc4fcad7fdf3377244265fdbb67c415dbe3 /src/net | |
parent | acd557f9472c711fe92b9c158ec336abf688bf7b (diff) | |
download | mana-client-e2897e4a7cb7eb0c4a7e46d72a9a19b909368c26.tar.gz mana-client-e2897e4a7cb7eb0c4a7e46d72a9a19b909368c26.tar.bz2 mana-client-e2897e4a7cb7eb0c4a7e46d72a9a19b909368c26.tar.xz mana-client-e2897e4a7cb7eb0c4a7e46d72a9a19b909368c26.zip |
Fix potential infinite recursion
Diffstat (limited to 'src/net')
-rw-r--r-- | src/net/manaserv/generalhandler.cpp | 2 | ||||
-rw-r--r-- | src/net/manaserv/network.cpp | 4 | ||||
-rw-r--r-- | src/net/manaserv/network.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/net/manaserv/generalhandler.cpp b/src/net/manaserv/generalhandler.cpp index db1d9013..2f4ad4a0 100644 --- a/src/net/manaserv/generalhandler.cpp +++ b/src/net/manaserv/generalhandler.cpp @@ -183,7 +183,7 @@ void GeneralHandler::guiWindowsUnloaded() void GeneralHandler::clearHandlers() { - clearHandlers(); + clearNetworkHandlers(); } } // namespace ManaServ diff --git a/src/net/manaserv/network.cpp b/src/net/manaserv/network.cpp index 91a7ed6a..0ca61fc2 100644 --- a/src/net/manaserv/network.cpp +++ b/src/net/manaserv/network.cpp @@ -71,7 +71,7 @@ void finalize() "are network connections left!"); } - clearHandlers(); + clearNetworkHandlers(); enet_deinitialize(); } @@ -102,7 +102,7 @@ void unregisterHandler(MessageHandler *handler) } } -void clearHandlers() +void clearNetworkHandlers() { mMessageHandlers.clear(); } diff --git a/src/net/manaserv/network.h b/src/net/manaserv/network.h index 9960f672..f667d5df 100644 --- a/src/net/manaserv/network.h +++ b/src/net/manaserv/network.h @@ -63,7 +63,7 @@ namespace ManaServ /** * Clears all registered message handlers. */ - void clearHandlers(); + void clearNetworkHandlers(); /* * Handles all events and dispatches incoming messages to the |