Skip to content

fix: fix active output device detection logic #411

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
deepin-bot merged 1 commit into from
Jan 6, 2026
Merged

fix: fix active output device detection logic #411

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
8 changes: 7 additions & 1 deletion plugins/dde-dock/sound/soundcontroller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,11 @@ void SoundController::onDefaultSinkChanged(const QDBusObjectPath &path)
if (m_defaultSinkInter)
m_defaultSinkInter->deleteLater();

if (path.path() == "/" || path.path().isEmpty()) {
qWarning() << "default sink path is invalid, skip setting default sink interface.";
return;
}

m_defaultSinkInter = new DBusSink("org.deepin.dde.Audio1", path.path(), QDBusConnection::sessionBus(), this);

SoundModel::ref().setActivePort(m_defaultSinkInter->card(), m_defaultSinkInter->activePort().name);
Expand Down Expand Up @@ -121,5 +126,6 @@ bool SoundController::existActiveOutputDevice() const
}
}
// 兼容云平台无端口的情况
return SoundModel::ref().ports().isEmpty() && m_defaultSinkInter && !m_defaultSinkInter->name().startsWith("auto_null") && !m_defaultSinkInter->name().contains("bluez");
const QString &sinkName = m_defaultSinkInter ? m_defaultSinkInter->name() : QString();
return SoundModel::ref().ports().isEmpty() && !sinkName.isEmpty() && !sinkName.startsWith("auto_null") && !sinkName.contains("bluez");
}