X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Fbufferview.cpp;h=3b9f657800e730e79784b7c8ada536f1d32c2d72;hb=5496fcc7a25b9b47a4fd6e254e1089cef4fa88f2;hp=37d0be5221ff5c6f3485f255c0731cbfda97b4f3;hpb=03896bdccdc8caf15bbce736680ba0f12bc2dc31;p=quassel.git

diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp
index 37d0be52..3b9f6578 100644
--- a/src/uisupport/bufferview.cpp
+++ b/src/uisupport/bufferview.cpp
@@ -19,7 +19,6 @@
  ***************************************************************************/
 
 #include "client.h"
-//#include "buffer.h"
 #include "bufferview.h"
 #include "networkmodel.h"
 
@@ -84,12 +83,15 @@ void BufferView::setModel(QAbstractItemModel *model) {
 }
 
 void BufferView::joinChannel(const QModelIndex &index) {
-  BufferItem::Type bufferType = (BufferItem::Type)index.data(NetworkModel::BufferTypeRole).toInt();
+  BufferItem::Type bufferType = (BufferItem::Type)index.data(NetworkModel::BufferTypeRole).value<int>();
 
   if(bufferType != BufferItem::ChannelType)
     return;
+
+  BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
   
-  Client::fakeInput(index.data(NetworkModel::BufferIdRole).value<BufferId>(), QString("/JOIN %1").arg(index.sibling(index.row(), 0).data().toString()));
+  Client::instance()->userInput(bufferInfo, QString("/JOIN %1").arg(bufferInfo.buffer()));
+  // Client::fakeInput(index.data(NetworkModel::BufferIdRole).value<BufferId>(), QString("/JOIN %1").arg(index.sibling(index.row(), 0).data().toString()));
 }
 
 void BufferView::keyPressEvent(QKeyEvent *event) {