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

kwin_wrapper: properly handle SIGTERM signals

Browse source 
QCoreApplication is not signal trap safe, use KSignalHandler to do it
properly.
This commit is contained in:
Aleix Pol 2022-02-10 18:50:16 +01:00 committed by Aleix Pol Gonzalez
parent e9db27d05d
commit 52c9eef122
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/helpers/wayland_wrapper/CMakeLists.txt
View file

@ -15,6 +15,6 @@ ecm_qt_declare_logging_category(kwin_wayland_wrapper
Warning
)
target_link_libraries(kwin_wayland_wrapper Qt5::Core Qt5::DBus KF5::DBusAddons KWinXwaylandCommon)
target_link_libraries(kwin_wayland_wrapper Qt5::Core Qt5::DBus KF5::DBusAddons KF5::CoreAddons KWinXwaylandCommon)
set_property(TARGET kwin_wayland_wrapper PROPERTY C_STANDARD 11)
install(TARGETS kwin_wayland_wrapper ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})

13
src/helpers/wayland_wrapper/kwin_wrapper.cpp
View file

@ -27,6 +27,7 @@
#include <QDBusConnection>
#include <UpdateLaunchEnvironmentJob>
#include <KSignalHandler>
#include <signal.h>
@ -156,17 +157,17 @@ void KWinWrapper::run()
});
}
void sigtermHandler(int)
{
qApp->quit();
}
int main(int argc, char **argv)
{
QCoreApplication app(argc, argv);
app.setQuitLockEnabled(false); // don't exit when the first KJob finishes
signal(SIGTERM, sigtermHandler);
KSignalHandler::self()->watchSignal(SIGTERM);
QObject::connect(KSignalHandler::self(), &KSignalHandler::signalReceived, &app, [&app](int signal) {
if (signal == SIGTERM) {
app.quit();
}
});
KWinWrapper wrapper(&app);
wrapper.run();