Skip to content

Commit 7e42356

Browse files
deepin-wmagent
authored andcommitted
fix(surface): guard null parentContainer in ensureQmlContext
parentContainer() can return null when the container has no parent. Calling qmlEngine() or setQmlEngine() on null leads to a crash. WM-29
1 parent 47bd753 commit 7e42356

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

src/surface/surfacecontainer.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,11 @@ void SurfaceContainer::removeOutput(Output *output)
203203

204204
void SurfaceContainer::ensureQmlContext()
205205
{
206-
if (QQmlEngine *engine = qmlEngine(parentContainer())) {
207-
parentContainer()->setQmlEngine(engine);
206+
auto *pc = parentContainer();
207+
if (!pc)
208+
return;
209+
if (QQmlEngine *engine = qmlEngine(pc)) {
210+
pc->setQmlEngine(engine);
208211
}
209212
}
210213

0 commit comments

Comments
 (0)