Skip to content

Fix double-removal Q_ASSERT in DockManagerPrivate::restoreStateFromXml #838

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fdarmayan wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix double-removal Q_ASSERT in DockManagerPrivate::restoreStateFromXml #838

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/DockManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,12 @@ bool DockManagerPrivate::restoreStateFromXml(const QByteArray &state, int versi
{
CFloatingDockContainer* floatingWidget = FloatingWidgets[i];
if (!floatingWidget) continue;
_this->removeDockContainer(floatingWidget->dockContainer());
// Use removeFromDockManager() (introduced in upstream commit 544c624) instead
// of removeDockContainer() so the container's back-pointer to the manager is
// cleared. Otherwise ~CDockContainerWidget() (called when deleteLater() fires)
// would try to remove this container a second time, tripping the
// Q_ASSERT(removed == 1) check in CDockManager::removeDockContainer().
floatingWidget->dockContainer()->removeFromDockManager();
floatingWidget->deleteLater();
}
}
Expand Down