X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fbuffermodel.cpp;h=1ae0c2e9d15878fa5871d168703e0ba87da9862e;hp=1a184ab759cc7d140adf207f02fde488d460fd56;hb=3474e986630907fa2a3f4143012ac2a42796609e;hpb=16b0c5bdd6fdaf3e6844ea5ec32e61b20e441284

diff --git a/src/client/buffermodel.cpp b/src/client/buffermodel.cpp
index 1a184ab7..1ae0c2e9 100644
--- a/src/client/buffermodel.cpp
+++ b/src/client/buffermodel.cpp
@@ -60,12 +60,13 @@ void BufferModel::networkConnectionChanged(Network::ConnectionState state) {
   switch(state) {
   case Network::Connecting:
   case Network::Initializing:
-  case Network::Initialized:
     if(currentIndex().isValid())
       return;
-    Network *net = qobject_cast<Network *>(sender());
-    Q_ASSERT(net);
-    setCurrentIndex(mapFromSource(Client::networkModel()->networkIndex(net->networkId())));
+    {
+      Network *net = qobject_cast<Network *>(sender());
+      Q_ASSERT(net);
+      setCurrentIndex(mapFromSource(Client::networkModel()->networkIndex(net->networkId())));
+    }
     break;
   default:
     return;
@@ -101,6 +102,17 @@ void BufferModel::switchToBufferIndex(const QModelIndex &bufferIdx) {
   qWarning() << "BufferModel::switchToBufferIndex(const QModelIndex &):" << bufferIdx << "does not belong to BufferModel or NetworkModel";
 }
 
+void BufferModel::switchToOrJoinBuffer(NetworkId networkId, const QString &name) {
+  BufferId bufId = Client::networkModel()->bufferId(networkId, name);
+  if(bufId.isValid()) {
+    QModelIndex targetIdx = Client::networkModel()->bufferIndex(bufId);
+    switchToBuffer(bufId);
+    if(!targetIdx.data(NetworkModel::ItemActiveRole).toBool())
+      Client::userInput(BufferInfo::fakeStatusBuffer(networkId), QString("/JOIN %1").arg(name));
+  } else
+    Client::userInput(BufferInfo::fakeStatusBuffer(networkId), QString("/JOIN %1").arg(name));
+}
+
 void BufferModel::debug_currentChanged(QModelIndex current, QModelIndex previous) {
   Q_UNUSED(previous);
   qDebug() << "Switched current Buffer: " << current << current.data().toString() << "Buffer:" << current.data(NetworkModel::BufferIdRole).value<BufferId>();