From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Tue, 8 Jul 2008 18:51:45 +0000 (+0200)
Subject: fixing tabcompleter crash in non channel buffers... ooooops
X-Git-Tag: 0.3.0~291
X-Git-Url: https://git.quassel-irc.org/?a=commitdiff_plain;h=599218b03a48c53299b6c539208508a25f855164;p=quassel.git

fixing tabcompleter crash in non channel buffers... ooooops
---

diff --git a/src/uisupport/tabcompleter.cpp b/src/uisupport/tabcompleter.cpp
index 33c0dfbd..cd82ee2b 100644
--- a/src/uisupport/tabcompleter.cpp
+++ b/src/uisupport/tabcompleter.cpp
@@ -41,13 +41,14 @@ TabCompleter::TabCompleter(InputLine *inputLine_)
 }
 
 void TabCompleter::buildCompletionList() {
+  // ensure a safe state in case we return early.
   completionMap.clear();
+  nextCompletion = completionMap.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()) {
-    nextCompletion = completionMap.begin();
+  if(!currentIndex.data(NetworkModel::BufferIdRole).isValid())
     return;
-  }
   
   NetworkId networkId = currentIndex.data(NetworkModel::NetworkIdRole).value<NetworkId>();
   QString channelName = currentIndex.sibling(currentIndex.row(), 0).data().toString();