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