yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

backends/drm: don't read configuration of zero outputs

Browse source 
Doesn't make any sense and can cause crashes
This commit is contained in:
Xaver Hugl 2022-01-19 15:31:11 +01:00
parent d67a0b006a
commit b0173c236c
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/backends/drm/drm_backend.cpp
View file

@ -434,6 +434,7 @@ namespace KWinKScreenIntegration
bool DrmBackend::readOutputsConfiguration(const QVector<DrmAbstractOutput*> &outputs) bool DrmBackend::readOutputsConfiguration(const QVector<DrmAbstractOutput*> &outputs)
{ {
Q_ASSERT(!outputs.isEmpty());
const auto outputsInfo = KWinKScreenIntegration::outputsConfig(outputs); const auto outputsInfo = KWinKScreenIntegration::outputsConfig(outputs);
AbstractWaylandOutput *primaryOutput = outputs.constFirst(); AbstractWaylandOutput *primaryOutput = outputs.constFirst();
@ -510,7 +511,7 @@ void DrmBackend::enableOutput(DrmAbstractOutput *output, bool enable)
m_placeHolderOutput = nullptr; m_placeHolderOutput = nullptr;
} }
} else { } else {
if (m_enabledOutputs.count() == 1) { if (m_enabledOutputs.count() == 1 && m_outputs.count() > 1) {
auto outputs = m_outputs; auto outputs = m_outputs;
outputs.removeOne(output); outputs.removeOne(output);
if (!readOutputsConfiguration(outputs)) { if (!readOutputsConfiguration(outputs)) {