diff options
| author | trianta <56975502+Trimutex@users.noreply.github.com> | 2024-09-05 11:26:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-05 17:26:46 +0100 |
| commit | bd6d6e7f3378c08fe48c179ba4ec3517fe10ae3f (patch) | |
| tree | 5f50dea8f863e5d5ae77cb3e088440dff8d84ff6 /src/xwayland/Server.cpp | |
| parent | 027140b7315efe3cd2e7b78fa608bd36da839894 (diff) | |
xwayland: add option to enable/disable xwayland (#7633)
* config: add xwayland enabled option to config
* xwayland: use DISPLAY env variable for enable/disable of new launches
* xwayland: close X11 windows when turning of XWayland
* clang: format fix
* config: add better description for xwayland:enabled
* xwayland: close X11 windows on disable without crashes
* xwayland: better method of informing CXWayland if xwayland enabled
* xwayland: prevent closing non-xwayland windows on disable
* misc: loop formatting
Diffstat (limited to 'src/xwayland/Server.cpp')
| -rw-r--r-- | src/xwayland/Server.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/xwayland/Server.cpp b/src/xwayland/Server.cpp index 200bec70..f3bf5768 100644 --- a/src/xwayland/Server.cpp +++ b/src/xwayland/Server.cpp @@ -432,7 +432,8 @@ int CXWaylandServer::ready(int fd, uint32_t mask) { pipeSource = nullptr; // start the wm - g_pXWayland->pWM = std::make_unique<CXWM>(); + if (!g_pXWayland->pWM) + g_pXWayland->pWM = std::make_unique<CXWM>(); g_pCursorManager->setXWaylandCursor(); |