Commit 3838651
authored
LP360: avoid double-removal of floating dock containers (#838)
In DockManagerPrivate::restoreStateFromXml() the floating widgets were
removed via removeDockContainer() and then queued for deletion with
deleteLater(). When ~CDockContainerWidget() ran it would call
removeDockContainer() a second time on the same container, tripping the
Q_ASSERT(removed == 1) check in CDockManager::removeDockContainer().
Switch to CDockContainerWidget::removeFromDockManager() (introduced in
upstream 544c624) so the container's back-pointer to the manager is
cleared up front and the destructor becomes a no-op for the manager
side. This keeps the LP360_AI workspace restore path crash-free until
the equivalent fix lands upstream.1 parent 985ff74 commit 3838651
1 file changed
Lines changed: 6 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
349 | 349 | | |
350 | 350 | | |
351 | 351 | | |
352 | | - | |
| 352 | + | |
| 353 | + | |
| 354 | + | |
| 355 | + | |
| 356 | + | |
| 357 | + | |
353 | 358 | | |
354 | 359 | | |
355 | 360 | | |
| |||
0 commit comments