1 files changed, 6 insertions, 6 deletions
diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
index 90f4c609..1111582e 100644
--- a/src/client/qwaylandwindow.cpp
+++ b/src/client/qwaylandwindow.cpp
@@ -267,18 +267,18 @@ void QWaylandWindow::endFrame()
 void QWaylandWindow::reset()
 {
     closeChildPopups();
-    delete mShellSurface;
-    mShellSurface = nullptr;
-    delete mSubSurfaceWindow;
-    mSubSurfaceWindow = nullptr;
-    mViewport.reset();
-    mFractionalScale.reset();
 
     if (mSurface) {
         emit wlSurfaceDestroyed();
         QWriteLocker lock(&mSurfaceLock);
         invalidateSurface();
+        delete mShellSurface;
+        mShellSurface = nullptr;
+        delete mSubSurfaceWindow;
+        mSubSurfaceWindow = nullptr;
         mSurface.reset();
+        mViewport.reset();
+        mFractionalScale.reset();
     }
 
     {