fix(group): Fix crash on group quit

Fix 'GroupWidget' removing
qTox · Aug 19, 2017 · e606d3c · e606d3c
1 parent e11352e
commit e606d3c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/src/widget/friendlistwidget.cpp b/src/widget/friendlistwidget.cpp
@@ -296,6 +296,12 @@ void FriendListWidget::addFriendWidget(FriendWidget* w, Status s, int circleInde
         circleWidget->addFriendWidget(w, s);
 }
 
+void FriendListWidget::removeGroupWidget(GroupWidget* w)
+{
+    groupLayout.removeSortedWidget(w);
+    w->deleteLater();
+}
+
 void FriendListWidget::removeFriendWidget(FriendWidget* w)
 {
     const Friend* contact = w->getFriend();

diff --git a/src/widget/friendlistwidget.h b/src/widget/friendlistwidget.h
@@ -51,6 +51,7 @@ class FriendListWidget : public QWidget
 
     void addGroupWidget(GroupWidget* widget);
     void addFriendWidget(FriendWidget* w, Status s, int circleIndex);
+    void removeGroupWidget(GroupWidget* w);
     void removeFriendWidget(FriendWidget* w);
     void addCircleWidget(int id);
     void addCircleWidget(FriendWidget* widget = nullptr);

diff --git a/src/widget/widget.cpp b/src/widget/widget.cpp
@@ -1791,7 +1791,8 @@ void Widget::removeGroup(Group* g, bool fake)
     groupWidgets.remove(groupId);
 
     Nexus::getCore()->removeGroup(groupId, fake);
-    delete widget;
+    contactListWidget->removeGroupWidget(widget);
+
     delete g;
     if (contentLayout && contentLayout->mainHead->layout()->isEmpty()) {
         onAddClicked();