Ticket #1454: patch4.diff

ServerThread.cpp

@@ -969 +969 @@
     LeaveCritSection(m_threadsync);
 }
 
-std::list<CServerThread::t_Notification> CServerThread::GetNotifications()
+void CServerThread::GetNotifications(std::list<CServerThread::t_Notification>& list)
 {
     EnterCritSection(m_threadsync);
     
-    std::list<t_Notification> list = m_pendingNotifications;
-    m_pendingNotifications.clear();
+    m_pendingNotifications.swap(list);
 
     if (m_throttled)
         SetPriority(THREAD_PRIORITY_NORMAL);
 
     LeaveCritSection(m_threadsync);
-
-    return list;
 }
 
 void CServerThread::AntiHammerIncrease(DWORD ip)

ServerThread.h

@@ -69 +69 @@
     };
 
     void SendNotification(WPARAM wParam, LPARAM lParam);
-    std::list<t_Notification> GetNotifications();
+    void GetNotifications(std::list<t_Notification>& list); // list MUST be empty when entering!
 
     void AntiHammerIncrease(DWORD ip);
     

Server.cpp

@@ -213 +213 @@
         CServerThread *pThread = pServer->m_ThreadNotificationIDs[index];
         if (pThread)
         {
-            std::list<CServerThread::t_Notification> notifications = pThread->GetNotifications();
+            std::list<CServerThread::t_Notification> notifications;
+            pThread->GetNotifications(notifications);
             for (std::list<CServerThread::t_Notification>::const_iterator iter = notifications.begin(); iter != notifications.end(); iter++)
                 if (pServer->OnServerMessage(pThread, iter->wParam, iter->lParam) != 0)
                     break;