1 files changed, 2 insertions, 8 deletions
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index 3a47cd16..954ee3f0 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -521,15 +521,9 @@ void ChatWindow::autoComplete()
 
     ChatTab *cTab = static_cast<ChatTab*>(mChatTabs->getSelectedTab());
     std::vector<std::string> nameList;
-    if (cTab && cTab->getType() == ChatTab::PARTY)
-    {
-        Party *p = player_node->getParty();
-
-        if (p) // Shouldn't be needed, but lets be safe
-            p->getNames(nameList);
+    cTab->getAutoCompleteList(nameList);
+    newName = autoComplete(nameList, name);
 
-        newName = autoComplete(nameList, name);
-    }
     if (newName == "")
     {
         beingManager->getPlayerNames(nameList, true);