Changeset View
Changeset View
Standalone View
Standalone View
autotests/integration/kwin_wayland_test.cpp
| Show First 20 Lines • Show All 59 Lines • ▼ Show 20 Line(s) | |||||
| 60 | WaylandTestApplication::~WaylandTestApplication() | 60 | WaylandTestApplication::~WaylandTestApplication() | ||
| 61 | { | 61 | { | ||
| 62 | kwinApp()->platform()->setOutputsEnabled(false); | 62 | kwinApp()->platform()->setOutputsEnabled(false); | ||
| 63 | // need to unload all effects prior to destroying X connection as they might do X calls | 63 | // need to unload all effects prior to destroying X connection as they might do X calls | ||
| 64 | // also before destroy Workspace, as effects might call into Workspace | 64 | // also before destroy Workspace, as effects might call into Workspace | ||
| 65 | if (effects) { | 65 | if (effects) { | ||
| 66 | static_cast<EffectsHandlerImpl*>(effects)->unloadAllEffects(); | 66 | static_cast<EffectsHandlerImpl*>(effects)->unloadAllEffects(); | ||
| 67 | } | 67 | } | ||
| 68 | if (m_xwayland) { | ||||
| 69 | // needs to be done before workspace gets destroyed | ||||
| 70 | m_xwayland->prepareDestroy(); | ||||
| 71 | } | ||||
| 68 | destroyWorkspace(); | 72 | destroyWorkspace(); | ||
| 69 | waylandServer()->dispatch(); | 73 | waylandServer()->dispatch(); | ||
| 70 | if (QStyle *s = style()) { | 74 | if (QStyle *s = style()) { | ||
| 71 | s->unpolish(this); | 75 | s->unpolish(this); | ||
| 72 | } | 76 | } | ||
| 73 | // kill Xwayland before terminating its connection | 77 | // kill Xwayland before terminating its connection | ||
| 74 | delete m_xwayland; | 78 | delete m_xwayland; | ||
| 75 | waylandServer()->terminateClientConnections(); | 79 | waylandServer()->terminateClientConnections(); | ||
| ▲ Show 20 Lines • Show All 62 Lines • Show Last 20 Lines | |||||