Skip to content

sync: from linuxdeepin/dde-session-shell #417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yixinshark merged 1 commit into from
May 15, 2025
Merged

sync: from linuxdeepin/dde-session-shell #417

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/lightdm-deepin-greeter/greeterworker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1209,6 +1209,11 @@ void GreeterWorker::prepareShutdownSound()
{
QDBusInterface soundPlayerInter("org.deepin.dde.SoundThemePlayer1", "/org/deepin/dde/SoundThemePlayer1",
"org.deepin.dde.SoundThemePlayer1", QDBusConnection::systemBus());
soundPlayerInter.call("PrepareShutdownSound", static_cast<int>(m_model->currentUser()->uid()));
if (!soundPlayerInter.isValid() || !m_model->currentUser()) {
qCWarning(DDE_SHELL) << "Sound player interface is not valid or current user is null:" << soundPlayerInter.isValid();
Copy link

@sourcery-ai sourcery-ai bot May 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggestion: Improve warning log to distinguish invalid interface vs null user

Log both conditions separately, for example include both soundPlayerInter.isValid() and whether m_model->currentUser() is null in the warning.

Suggested change
qCWarning(DDE_SHELL) << "Sound player interface is not valid or current user is null:" << soundPlayerInter.isValid();
qCWarning(DDE_SHELL) << "Cannot prepare shutdown sound, interface valid? " << soundPlayerInter.isValid()
<< ", current user null? " << (m_model->currentUser() == nullptr);

return;
}

//soundPlayerInter.call("PrepareShutdownSound", static_cast<int>(m_model->currentUser()->uid()));
}
#endif
Loading