1 files changed, 14 insertions, 12 deletions
diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
index bb33a747f..4c8d2eedc 100644
--- a/src/client/qwaylandwindow.cpp
+++ b/src/client/qwaylandwindow.cpp
@@ -283,19 +283,21 @@ void QWaylandWindow::reset()
         mTopPopup = mTransientParent && (mTransientParent->window()->type() == Qt::Popup) ? mTransientParent : nullptr;
 
     if (mSurface) {
+        {
+            QWriteLocker lock(&mSurfaceLock);
+            invalidateSurface();
+            if (mTransientParent)
+                mTransientParent->removeChildPopup(this);
+            delete mShellSurface;
+            mShellSurface = nullptr;
+            delete mSubSurfaceWindow;
+            mSubSurfaceWindow = nullptr;
+            mTransientParent = nullptr;
+            mSurface.reset();
+            mViewport.reset();
+            mFractionalScale.reset();
+        }
         emit wlSurfaceDestroyed();
-        QWriteLocker lock(&mSurfaceLock);
-        invalidateSurface();
-        if (mTransientParent)
-            mTransientParent->removeChildPopup(this);
-        delete mShellSurface;
-        mShellSurface = nullptr;
-        delete mSubSurfaceWindow;
-        mSubSurfaceWindow = nullptr;
-        mTransientParent = nullptr;
-        mSurface.reset();
-        mViewport.reset();
-        mFractionalScale.reset();
     }
 
     {