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

[quassel.git] / src / qtopia / nicklistwidget.cpp

diff --git a/src/qtopia/nicklistwidget.cpp b/src/qtopia/nicklistwidget.cpp
index 36f524a..7c8361f 100644 (file)
--- a/src/qtopia/nicklistwidget.cpp
+++ b/src/qtopia/nicklistwidget.cpp
@@ -5,7 +5,7 @@
  *   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        *
@@ -53,6 +53,7 @@ void NickListWidget::setBuffer(Buffer *buf) {
       nickViews[buf] = view;
       ui.stackedWidget->addWidget(view);
       ui.stackedWidget->setCurrentWidget(view);
+      connect(buf, SIGNAL(destroyed(QObject *)), this, SLOT(bufferDestroyed(QObject *)));
     }
   }
 }
@@ -62,4 +63,14 @@ void NickListWidget::reset() {
     ui.stackedWidget->removeWidget(view);
     view->deleteLater();
   }
+  nickViews.clear();
 }
+
+void NickListWidget::bufferDestroyed(QObject *buf) {
+  if(nickViews.contains((Buffer *)buf)) {
+    NickView *view = nickViews.take((Buffer *)buf);
+    ui.stackedWidget->removeWidget(view);
+    view->deleteLater();
+  }
+}
+