Changeset View
Changeset View
Standalone View
Standalone View
backends/kwayland/waylandconfig.cpp
| Show First 20 Lines • Show All 239 Lines • ▼ Show 20 Line(s) | |||||
| 240 | { | 240 | { | ||
| 241 | if (m_initializingOutputs.removeOne(output)) { | 241 | if (m_initializingOutputs.removeOne(output)) { | ||
| 242 | // output was not yet fully initialized, just remove here and return | 242 | // output was not yet fully initialized, just remove here and return | ||
| 243 | delete output; | 243 | delete output; | ||
| 244 | return; | 244 | return; | ||
| 245 | } | 245 | } | ||
| 246 | 246 | | |||
| 247 | // remove the output from output mapping | 247 | // remove the output from output mapping | ||
| 248 | Q_ASSERT(m_outputMap.take(output->id()) == output); | 248 | const auto removedOutput = m_outputMap.take(output->id()); | ||
| 249 | Q_ASSERT(removedOutput == output); Q_UNUSED(removedOutput); | ||||
| 249 | m_screen->setOutputs(m_outputMap.values()); | 250 | m_screen->setOutputs(m_outputMap.values()); | ||
| 250 | delete output; | 251 | delete output; | ||
| 251 | 252 | | |||
| 252 | if (!m_blockSignals) { | 253 | if (!m_blockSignals) { | ||
| 253 | Q_EMIT configChanged(); | 254 | Q_EMIT configChanged(); | ||
| 254 | } | 255 | } | ||
| 255 | } | 256 | } | ||
| 256 | 257 | | |||
| ▲ Show 20 Lines • Show All 110 Lines • Show Last 20 Lines | |||||