X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Ftabcompleter.cpp;h=fbd69047c9c62a3dde1968d972660adac55ae32b;hp=87a745adc6b138cccc04215850ebefb42b9132d2;hb=f5539e2ce05f5beac9d789ec615ded695f325fc7;hpb=9f923167f8c8bdadf24f41ab02ae478123f83caa

diff --git a/src/uisupport/tabcompleter.cpp b/src/uisupport/tabcompleter.cpp
index 87a745ad..fbd69047 100644
--- a/src/uisupport/tabcompleter.cpp
+++ b/src/uisupport/tabcompleter.cpp
@@ -42,11 +42,12 @@ TabCompleter::TabCompleter(InputLine *inputLine_)
 
 void TabCompleter::buildCompletionList() {
   completionList.clear();
-  nextCompletion = completionList.begin();
   // this is the first time tab is pressed -> build up the completion list and it's iterator
   QModelIndex currentIndex = Client::bufferModel()->currentIndex();
-  if(!currentIndex.data(NetworkModel::BufferIdRole).isValid())
+  if(!currentIndex.data(NetworkModel::BufferIdRole).isValid()) {
+    nextCompletion = completionList.begin();
     return;
+  }
   
   NetworkId networkId = currentIndex.data(NetworkModel::NetworkIdRole).value<NetworkId>();
   QString channelName = currentIndex.sibling(currentIndex.row(), 0).data().toString();
@@ -68,9 +69,7 @@ void TabCompleter::buildCompletionList() {
 	  this, SLOT(ircUserJoinedOrParted(IrcUser *)));
   */
 
-  completionList.clear();
   QString tabAbbrev = inputLine->text().left(inputLine->cursorPosition()).section(' ',-1,-1);
-  completionList.clear();
   QRegExp regex(QString("^[^a-zA-Z]*").append(tabAbbrev), Qt::CaseInsensitive);
   QMap<QString, QString> sortMap;