2 files changed, 8 insertions, 1 deletions
diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp
index 52e9a7873..6e6b9927e 100644
--- a/src/net/ea/chathandler.cpp
+++ b/src/net/ea/chathandler.cpp
@@ -87,6 +87,12 @@ void ChatHandler::processWhisperResponse(Net::MessageIn &msg)
 {
     BLOCK_START("ChatHandler::processWhisperResponse")
 
+    const uint8_t type = msg.readUInt8("response");
+    processWhisperResponseContinue(type);
+}
+
+void ChatHandler::processWhisperResponseContinue(const uint8_t type)
+{
     std::string nick;
     if (mSentWhispers.empty())
     {
@@ -98,7 +104,6 @@ void ChatHandler::processWhisperResponse(Net::MessageIn &msg)
         mSentWhispers.pop();
     }
 
-    const uint8_t type = msg.readUInt8("response");
     switch (type)
     {
         case 0x00:
diff --git a/src/net/ea/chathandler.h b/src/net/ea/chathandler.h
index 338d49b44..e33b2433a 100644
--- a/src/net/ea/chathandler.h
+++ b/src/net/ea/chathandler.h
@@ -61,6 +61,8 @@ class ChatHandler notfinal : public Net::ChatHandler
         void processWhisperContinue(const std::string &nick,
                                     std::string chatMsg) const;
 
+        void processWhisperResponseContinue(const uint8_t type);
+
     protected:
         typedef std::queue<std::string> WhisperQueue;
         WhisperQueue mSentWhispers;