git-svn-id: svn://imanolbarba.net/PAD@42 c2ee353e-ed0d-4329-bf56-03aec153487f

Imanol-Mikel Barba Sabariego
1 parent 0a21b29f
Showing 3 changed files with 12 additions and 10 deletions
QChatClient/QChatClient.pro.user
QChatClient/chatroom.cpp
build-QChatClient-Desktop-Debug/QChatClient
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 2.7.1, 2013-12-27T07:19:09. -->
+<!-- Written by QtCreator 2.7.1, 2013-12-27T07:31:56. -->
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
@@ -200,18 +200,20 @@ void Chatroom::updateUserList(QString userlist)
 void Chatroom::relayMsg(string msg)
 {
     string sender = getSender(msg);
-    //AT LEAST SOME FUCKING SANITY CHECK... PLEASE!!!
-    map<string,void*>::iterator it = activeChats.begin();
-    it = activeChats.find(sender);
-    if(it == activeChats.end())
+    if(!ui->userList->findItems(QString::fromStdString(sender),Qt::MatchExactly | Qt::MatchCaseSensitive).isEmpty())
     {
-        chatLock->lock();
-        emit createChat(QString::fromStdString(sender));
-        chatCreated.wait(*chatLock);
-        chatLock->unlock();
+        map<string,void*>::iterator it = activeChats.begin();
         it = activeChats.find(sender);
+        if(it == activeChats.end())
+        {
+            chatLock->lock();
+            emit createChat(QString::fromStdString(sender));
+            chatCreated.wait(*chatLock);
+            chatLock->unlock();
+            it = activeChats.find(sender);
+        }
+        ((ChatWindow*)it->second)->notifyPrint(msg);
     }
-    ((ChatWindow*)it->second)->notifyPrint(msg); //NOT GOOD!
 }
  
 void Chatroom::newChat(QString peerNick)