Commit e22c168
committed
fix: improve shutdown logic and update copyright year
Updated copyright year from 2023 to 2026. Modified the prepareShutdown
method to always call preparePlayShutdownSound, removing the previous
conditional check based on the 'force' parameter. Added a new
conditional block for forced shutdowns that executes the dde-session-ctl
command with the --shutdown flag. This ensures the shutdown sound plays
consistently for all shutdown types (normal and forced) and provides
a proper, immediate shutdown path when force is required, bypassing
application preparation delays.
Log: Shutdown sound now plays during forced shutdown; forced shutdown
uses a direct command for immediate termination.
fix: 改进关机逻辑并更新版权年份
将版权年份从2023更新到2026。修改了prepareShutdown方法,使其总是调用
preparePlayShutdownSound,移除了之前基于'force'参数的条件判断。新增了一
个用于强制关机的条件代码块,该块会执行带有--shutdown标志的dde-session-
ctl命令。这确保了关机音效在所有关机类型(正常和强制)下都能一致播放,并
在需要强制关机时提供了一条直接、立即的关机路径,绕过了应用程序的准备工作
延迟。
Log: 强制关机时现在会播放关机音效;强制关机使用直接命令实现立即终止。
PMS: BUG-2817471 parent 988ce4f commit e22c168
File tree
3 files changed
+14
-31
lines changed- dbus/adaptor
- src/dde-session/impl
3 files changed
+14
-31
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | 20 | | |
24 | 21 | | |
25 | 22 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| |||
289 | 289 | | |
290 | 290 | | |
291 | 291 | | |
292 | | - | |
293 | | - | |
294 | | - | |
295 | | - | |
296 | | - | |
297 | | - | |
298 | | - | |
299 | | - | |
300 | | - | |
301 | | - | |
302 | | - | |
303 | | - | |
304 | | - | |
305 | | - | |
306 | | - | |
307 | | - | |
308 | | - | |
309 | | - | |
310 | 292 | | |
311 | 293 | | |
312 | 294 | | |
| |||
451 | 433 | | |
452 | 434 | | |
453 | 435 | | |
454 | | - | |
| 436 | + | |
455 | 437 | | |
456 | 438 | | |
457 | 439 | | |
458 | 440 | | |
459 | | - | |
| 441 | + | |
460 | 442 | | |
461 | 443 | | |
462 | 444 | | |
| |||
517 | 499 | | |
518 | 500 | | |
519 | 501 | | |
520 | | - | |
521 | | - | |
522 | | - | |
523 | | - | |
| 502 | + | |
524 | 503 | | |
| 504 | + | |
| 505 | + | |
| 506 | + | |
| 507 | + | |
| 508 | + | |
| 509 | + | |
| 510 | + | |
| 511 | + | |
| 512 | + | |
| 513 | + | |
525 | 514 | | |
526 | 515 | | |
527 | 516 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
49 | 49 | | |
50 | 50 | | |
51 | 51 | | |
52 | | - | |
53 | | - | |
54 | | - | |
55 | 52 | | |
56 | 53 | | |
57 | 54 | | |
| |||
0 commit comments