Skip to content

fix(linux/xdgportal): Additional error handling and minor code improvements #4979

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
ReenigneArcher merged 3 commits into from
Apr 13, 2026
Merged

fix(linux/xdgportal): Additional error handling and minor code improvements #4979

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2c819b
fix(linux/xdgportal): Stop portal display init if there are no stream…
Kishi85 Apr 12, 2026
70b3e79
fix(linux/xdgportal): Initialize pipewire before portal display init
Kishi85 Apr 12, 2026
c360296
fix(linux/xdgportal): Fix some SonarQube issues
Kishi85 Apr 12, 2026
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
18 changes: 13 additions & 5 deletions src/platform/linux/portalgrab.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,8 @@ namespace portal {

class dbus_t {
public:
dbus_t &operator=(dbus_t &&) = delete; // Do not allow to copying

~dbus_t() noexcept {
try {
if (conn && !session_handle.empty()) {
Expand Down Expand Up @@ -747,7 +749,7 @@ namespace portal {
maxframerate_failed_ = true;
}

bool is_portal_secured() {
bool is_portal_secured() const {
return is_portal_secured_;
}

Expand Down Expand Up @@ -1309,7 +1311,12 @@ namespace portal {
// Match display_name to a stream from the pipewire_streams vector
bool use_fallback = true;
pipewire_streaminfo_t stream;
for (const auto &stream_ : dbus.pipewire_streams) {
auto streams = dbus.pipewire_streams;
if (streams.empty()) {
BOOST_LOG(error) << "[portalgrab] No streams found on portal. portal_t::init() failed.";
return -1;
}
for (const auto &stream_ : streams) {
if (stream_.match_display_name(display_name)) {
stream = stream_;
use_fallback = false;
Expand All @@ -1319,7 +1326,7 @@ namespace portal {
// Fall back to first stream if we cannot match the given display_name to a stream in currently available streams.
if (use_fallback) {
BOOST_LOG(info) << "[portalgrab] Using first available stream as no matching stream was found for: '"sv << display_name << "'";
stream = dbus.pipewire_streams[0];
stream = dbus.pipewire_streams.at(0);
}
// Set values inherited from display_t
width = stream.width;
Expand Down Expand Up @@ -1696,6 +1703,9 @@ namespace platf {
// Drop CAP_SYS_ADMIN and set DUMPABLE flag to allow XDG /root access
portal::runtime_t::instance().finalize_portal_security();

// Ensure pipewire is initialized and modules are loaded
pw_init(nullptr, nullptr);

auto portal = std::make_shared<portal::portal_t>();
if (portal->init(hwdevice_type, display_name, config)) {
return nullptr;
Expand All @@ -1713,8 +1723,6 @@ namespace platf {
return {};
}

pw_init(nullptr, nullptr);

if (!portal::runtime_t::instance().is_portal_secured()) {
// We're still in the probing phase of Sunshine startup. Dropping portal security early will break KMS.
// Just return a dummy screen for now. Display re-enumeration after encoder probing will yield full result.
Expand Down
Loading