StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Multi-window: Fix segfault on removing groups and friends who are also in active windows

Browse Source
This commit is contained in:
TheSpiritXIII 2015-07-01 10:19:15 -04:00 committed by tux3
parent c5317c6137
commit 29c72549a2
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/widget/widget.cpp
View File

@ -1221,11 +1221,16 @@ void Widget::removeFriend(Friend* f, bool fake)
contactListWidget->removeFriendWidget(f->getFriendWidget());
ContentDialog* lastDialog = ContentDialog::getFriendDialog(f->getFriendID());
if (lastDialog != nullptr)
lastDialog->removeFriend(f->getFriendID());
FriendList::removeFriend(f->getFriendID(), fake);
Nexus::getCore()->removeFriend(f->getFriendID(), fake);
delete f;
if (contentLayout->mainHead->layout()->isEmpty())
if (contentLayout != nullptr && contentLayout->mainHead->layout()->isEmpty())
onAddClicked();
contactListWidget->reDraw();
@ -1402,6 +1407,12 @@ void Widget::removeGroup(Group* g, bool fake)
onAddClicked();
}
GroupList::removeGroup(g->getGroupId(), fake);
ContentDialog* contentDialog = ContentDialog::getGroupDialog(g->getGroupId());
if (contentDialog != nullptr)
contentDialog->removeGroup(g->getGroupId());
Nexus::getCore()->removeGroup(g->getGroupId(), fake);
delete g;
if (contentLayout != nullptr && contentLayout->mainHead->layout()->isEmpty())