yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[wayland] Disable Compositor during tear-down

Browse source 
Prevents rendering an incomplete state and as well prevents from
running performCompositing() which could access Workspace and crash.
This commit is contained in:
Martin Gräßlin 2015-11-12 15:12:01 +01:00
parent 238ff89edb
commit f2bdb4818a
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
abstract_backend.h
View file

@ -89,6 +89,9 @@ public:
bool areOutputsEnabled() const { bool areOutputsEnabled() const {
return m_outputsEnabled; return m_outputsEnabled;
} }
void setOutputsEnabled(bool enabled) {
m_outputsEnabled = enabled;
}
public Q_SLOTS: public Q_SLOTS:
void pointerMotion(const QPointF &position, quint32 time); void pointerMotion(const QPointF &position, quint32 time);
@ -131,9 +134,6 @@ protected:
void setSupportsPointerWarping(bool set) { void setSupportsPointerWarping(bool set) {
m_pointerWarping = set; m_pointerWarping = set;
} }
void setOutputsEnabled(bool enabled) {
m_outputsEnabled = enabled;
}
private: private:
void triggerCursorRepaint(); void triggerCursorRepaint();

1
autotests/wayland/kwin_wayland_test.cpp
View file

@ -51,6 +51,7 @@ WaylandTestApplication::WaylandTestApplication(int &argc, char **argv)
WaylandTestApplication::~WaylandTestApplication() WaylandTestApplication::~WaylandTestApplication()
{ {
waylandServer()->backend()->setOutputsEnabled(false);
destroyWorkspace(); destroyWorkspace();
waylandServer()->dispatch(); waylandServer()->dispatch();
// need to unload all effects prior to destroying X connection as they might do X calls // need to unload all effects prior to destroying X connection as they might do X calls

1
main_wayland.cpp
View file

@ -75,6 +75,7 @@ ApplicationWayland::ApplicationWayland(int &argc, char **argv)
ApplicationWayland::~ApplicationWayland() ApplicationWayland::~ApplicationWayland()
{ {
waylandServer()->backend()->setOutputsEnabled(false);
destroyWorkspace(); destroyWorkspace();
waylandServer()->dispatch(); waylandServer()->dispatch();
// need to unload all effects prior to destroying X connection as they might do X calls // need to unload all effects prior to destroying X connection as they might do X calls