fixing tabcompleter crash in non channel buffers... ooooops

[quassel.git] / src / uisupport / tabcompleter.cpp

diff --git a/src/uisupport/tabcompleter.cpp b/src/uisupport/tabcompleter.cpp
index 33c0dfb..cd82ee2 100644 (file)
--- a/src/uisupport/tabcompleter.cpp
+++ b/src/uisupport/tabcompleter.cpp
@@ -41,13 +41,14 @@ TabCompleter::TabCompleter(InputLine *inputLine_)
 }
 
 void TabCompleter::buildCompletionList() {
 }
 
 void TabCompleter::buildCompletionList() {

+  // ensure a safe state in case we return early.

   completionMap.clear();
   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();
   // 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;
     return;

-  }

   
   NetworkId networkId = currentIndex.data(NetworkModel::NetworkIdRole).value<NetworkId>();
   QString channelName = currentIndex.sibling(currentIndex.row(), 0).data().toString();
   
   NetworkId networkId = currentIndex.data(NetworkModel::NetworkIdRole).value<NetworkId>();
   QString channelName = currentIndex.sibling(currentIndex.row(), 0).data().toString();