| Revision | 42006b194e9c7d0e1aec334627f5738516cf1fe7 (tree) |
|---|---|
| Time | 2022-11-30 08:26:58 |
| Author | Ivailo Monev <xakepa10@gmai...> |
| Commiter | Ivailo Monev |
plasma: check if shutdown can be performed from PowerManagementJob::start()
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
| @@ -47,8 +47,8 @@ void PowerManagementJob::start() | ||
| 47 | 47 | //kDebug() << "starting operation ... " << operation; |
| 48 | 48 | |
| 49 | 49 | if (operation == "lockScreen") { |
| 50 | -#warning TODO: error check, also what about inhibitions? | |
| 51 | - const QString interface("org.freedesktop.ScreenSaver"); | |
| 50 | +#warning TODO: error check | |
| 51 | + static const QString interface("org.freedesktop.ScreenSaver"); | |
| 52 | 52 | QDBusInterface screensaver(interface, "/ScreenSaver"); |
| 53 | 53 | screensaver.asyncCall("Lock"); |
| 54 | 54 | setResult(true); |
| @@ -78,6 +78,10 @@ void PowerManagementJob::start() | ||
| 78 | 78 | setResult(true); |
| 79 | 79 | return; |
| 80 | 80 | } else if (operation == "requestShutDown") { |
| 81 | + if (!KWorkSpace::canShutDown()) { | |
| 82 | + setResult(false); | |
| 83 | + return; | |
| 84 | + } | |
| 81 | 85 | KWorkSpace::requestShutDown(); |
| 82 | 86 | setResult(true); |
| 83 | 87 | return; |
Fork
plasma/dataengines/powermanagement/powermanagementjob.cpp