Changeset View
Changeset View
Standalone View
Standalone View
autotests/integration/kwin_wayland_test.cpp
Show First 20 Lines • Show All 77 Lines • ▼ Show 20 Line(s) | |||||
78 | { | 78 | { | ||
79 | setTerminating(); | 79 | setTerminating(); | ||
80 | kwinApp()->platform()->setOutputsEnabled(false); | 80 | kwinApp()->platform()->setOutputsEnabled(false); | ||
81 | // need to unload all effects prior to destroying X connection as they might do X calls | 81 | // need to unload all effects prior to destroying X connection as they might do X calls | ||
82 | // also before destroy Workspace, as effects might call into Workspace | 82 | // also before destroy Workspace, as effects might call into Workspace | ||
83 | if (effects) { | 83 | if (effects) { | ||
84 | static_cast<EffectsHandlerImpl*>(effects)->unloadAllEffects(); | 84 | static_cast<EffectsHandlerImpl*>(effects)->unloadAllEffects(); | ||
85 | } | 85 | } | ||
86 | if (m_xwayland) { | ||||
87 | // needs to be done before workspace gets destroyed | ||||
88 | m_xwayland->prepareDestroy(); | ||||
89 | } | ||||
86 | destroyWorkspace(); | 90 | destroyWorkspace(); | ||
87 | waylandServer()->dispatch(); | 91 | waylandServer()->dispatch(); | ||
88 | if (QStyle *s = style()) { | 92 | if (QStyle *s = style()) { | ||
89 | s->unpolish(this); | 93 | s->unpolish(this); | ||
90 | } | 94 | } | ||
91 | // kill Xwayland before terminating its connection | 95 | // kill Xwayland before terminating its connection | ||
92 | delete m_xwayland; | 96 | delete m_xwayland; | ||
93 | waylandServer()->terminateClientConnections(); | 97 | waylandServer()->terminateClientConnections(); | ||
▲ Show 20 Lines • Show All 62 Lines • Show Last 20 Lines |