From d3a2a8ea6e5ac1bf2352324a3718d1d7760d1925 Mon Sep 17 00:00:00 2001 From: zhenyan huang Date: Wed, 11 Dec 2024 12:26:02 +0000 Subject: [PATCH] backends/drm: fix the incorrect use of std::optional we only enable an output if we do declare it's enabled = true. --- src/backends/drm/drm_backend.cpp | 2 +- src/core/outputbackend.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/backends/drm/drm_backend.cpp b/src/backends/drm/drm_backend.cpp index fcb15b5a18..afccaeca55 100644 --- a/src/backends/drm/drm_backend.cpp +++ b/src/backends/drm/drm_backend.cpp @@ -377,7 +377,7 @@ bool DrmBackend::applyOutputChanges(const OutputConfiguration &config) } if (const auto changeset = config.constChangeSet(output)) { output->queueChanges(changeset); - if (changeset->enabled) { + if (changeset->enabled.value_or(output->isEnabled())) { toBeEnabled << output; } else { toBeDisabled << output; diff --git a/src/core/outputbackend.cpp b/src/core/outputbackend.cpp index 6d7631cd4a..e38b57839c 100644 --- a/src/core/outputbackend.cpp +++ b/src/core/outputbackend.cpp @@ -50,7 +50,7 @@ bool OutputBackend::applyOutputChanges(const OutputConfiguration &config) QList toBeDisabledOutputs; for (const auto &output : availableOutputs) { if (const auto changeset = config.constChangeSet(output)) { - if (changeset->enabled) { + if (changeset->enabled.value_or(output->isEnabled())) { toBeEnabledOutputs << output; } else { toBeDisabledOutputs << output;