Prevent Quassel from crashing upon core dis- and reconnect and make the NickListWidgets

[quassel.git] / src / qtui / bufferwidget.cpp

diff --git a/src/qtui/bufferwidget.cpp b/src/qtui/bufferwidget.cpp
index 9bb2cab..c647461 100644 (file)
--- a/src/qtui/bufferwidget.cpp
+++ b/src/qtui/bufferwidget.cpp
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by The Quassel Team                             *
+ *   Copyright (C) 2005-07 by the Quassel IRC Team                         *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   (at your option) version 3.                                           *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -59,8 +59,8 @@ void BufferWidget::setBuffer(Buffer *buf) {
   // ui.ownNick->addItem(state->ownNick);
 
   ChatWidget *chatWidget;
-  if(_chatWidgets.contains(buf->uid())) {
-     chatWidget = _chatWidgets[buf->uid()];
+  if(_chatWidgets.contains(buf)) {
+     chatWidget = _chatWidgets[buf];
   } else {
     chatWidget = new ChatWidget(this);
     chatWidget->init(buf->networkName(), buf->name());
@@ -70,9 +70,10 @@ void BufferWidget::setBuffer(Buffer *buf) {
       lines.append(dynamic_cast<ChatLine*>(msg));
     }
     chatWidget->setContents(lines);
+    connect(buf, SIGNAL(destroyed(QObject *)), this, SLOT(bufferDestroyed(QObject *)));
     connect(buf, SIGNAL(msgAppended(AbstractUiMsg *)), chatWidget, SLOT(appendMsg(AbstractUiMsg *)));
     connect(buf, SIGNAL(msgPrepended(AbstractUiMsg *)), chatWidget, SLOT(prependMsg(AbstractUiMsg *)));
-    _chatWidgets[buf->uid()] = chatWidget;
+    _chatWidgets[buf] = chatWidget;
     ui.stackedWidget->addWidget(chatWidget);
   }
   ui.stackedWidget->setCurrentWidget(chatWidget);
@@ -84,6 +85,12 @@ void BufferWidget::setBuffer(Buffer *buf) {
   // ui.ownNick->addItem(state->ownNick);
 }
 
+void BufferWidget::bufferDestroyed(QObject *buf) {
+  QWidget *widget = _chatWidgets[(Buffer*)buf];
+  ui.stackedWidget->removeWidget(widget);
+  widget->deleteLater();
+}
+
 void BufferWidget::saveState() {
 
 }
@@ -110,6 +117,7 @@ void BufferWidget::setActive(bool act) {
 }
 
 
+
 /*
 void BufferWidget::displayMsg(Message msg) {
   chatWidget->appendMsg(msg);