mirrors/mumble
2
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-10-26 11:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash when moving populated channels to parents.

Browse Source 
git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@1154 05730e5d-ab1b-0410-a4ac-84af385074fa
This commit is contained in:
Thorvald Natvig 2008-05-10 11:14:08 +00:00
parent 4f74fd7047
commit 20e9aae466
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/mumble/PlayerModel.cpp
View File

@ -58,14 +58,23 @@ ModelItem::ModelItem(ClientPlayer *p) {
}
ModelItem::ModelItem(ModelItem *i) {
// Create a dummy clone.
// Create a full clone
this->cChan = i->cChan;
this->pPlayer = i->pPlayer;
this->parent = i->parent;
if (pPlayer)
c_qhPlayers.insert(pPlayer, this);
else if (cChan)
c_qhChannels.insert(cChan, this);
iPlayers = i->iPlayers;
foreach(ModelItem *child, i->qlChildren) {
ModelItem *ni = new ModelItem(child);
ni->parent = this;
qlChildren << ni;
}
}
ModelItem::~ModelItem() {
@ -77,15 +86,13 @@ ModelItem::~ModelItem() {
c_qhPlayers.remove(pPlayer);
}
void ModelItem::stealChildren(ModelItem *other) {
Q_ASSERT(qlChildren.count() == 0);
qlChildren = other->qlChildren;
other->qlChildren.clear();
foreach(ModelItem *mi, qlChildren)
mi->parent = this;
iPlayers = other->iPlayers;
other->iPlayers = 0;
void ModelItem::wipe() {
foreach(ModelItem *i, qlChildren) {
i->wipe();
delete i;
}
qlChildren.clear();
iPlayers = 0;
}
ModelItem *ModelItem::child(int idx) const {
@ -501,8 +508,6 @@ void PlayerModel::moveItem(ModelItem *oldparent, ModelItem *newparent, ModelItem
newparent->cChan->addPlayer(item->pPlayer);
}
t->stealChildren(item);
endInsertRows();
changePersistentIndex(createIndex(oldrow, 0, item), createIndex(newrow, 0, t));
@ -511,6 +516,7 @@ void PlayerModel::moveItem(ModelItem *oldparent, ModelItem *newparent, ModelItem
oldparent->qlChildren.removeAt(oldrow);
endRemoveRows();
item->wipe();
delete item;
if (active.isValid()) {

2
src/mumble/PlayerModel.h
View File

@ -75,7 +75,7 @@ struct ModelItem {
int rows() const;
int insertIndex(Channel *c) const;
int insertIndex(ClientPlayer *p) const;
void stealChildren(ModelItem *other);
void wipe();
};
class ChannelItem;