Home
Phabricator
Search
Log In
Paste
P581
Masterwork From Distant Lands
Active
Public
Actions
Authored by
davidedmundson
on Apr 9 2020, 4:29 PM.
Edit Paste
Archive Paste
View Raw File
Subscribe
Mute Notifications
Award Token
Flag For Later
Tags
None
Subscribers
None
diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
index 5830c136..5b2236ee 100644
--- a/src/client/qwaylandwindow.cpp
+++ b/src/client/qwaylandwindow.cpp
@@ -93,6 +93,11 @@ QWaylandWindow::~QWaylandWindow()
if (mSurface)
reset(false);
+ if (mFrameCallback) {
+ wl_callback_destroy(mFrameCallback);
+ mFrameCallback = nullptr;
+ }
+
const QWindow *parent = window();
const auto tlw = QGuiApplication::topLevelWindows();
for (QWindow *w : tlw) {
@@ -250,11 +255,6 @@ void QWaylandWindow::reset(bool sendDestroyEvent)
mSurface.reset();
}
- if (mFrameCallback) {
- wl_callback_destroy(mFrameCallback);
- mFrameCallback = nullptr;
- }
-
int timerId = mFrameCallbackTimerId.fetchAndStoreOrdered(-1);
if (timerId != -1) {
killTimer(timerId);
davidedmundson
edited the content of this paste.
(Show Details)
Apr 9 2020, 4:29 PM
davidedmundson
changed the title of this paste from untitled to
Masterwork From Distant Lands
.
Log In to Comment