Changeset View
Changeset View
Standalone View
Standalone View
kded/daemon.cpp
Show First 20 Lines • Show All 246 Lines • ▼ Show 20 Line(s) | |||||
247 | } | 247 | } | ||
248 | 248 | | |||
249 | void KScreenDaemon::configChanged() | 249 | void KScreenDaemon::configChanged() | ||
250 | { | 250 | { | ||
251 | qCDebug(KSCREEN_KDED) << "Change detected"; | 251 | qCDebug(KSCREEN_KDED) << "Change detected"; | ||
252 | logConfig(m_monitoredConfig); | 252 | logConfig(m_monitoredConfig); | ||
253 | 253 | | |||
254 | // Modes may have changed, fix-up current mode id | 254 | // Modes may have changed, fix-up current mode id | ||
255 | bool changed = false; | ||||
255 | Q_FOREACH(const KScreen::OutputPtr &output, m_monitoredConfig->outputs()) { | 256 | Q_FOREACH(const KScreen::OutputPtr &output, m_monitoredConfig->outputs()) { | ||
256 | if (output->isConnected() && output->isEnabled() && output->currentMode().isNull()) { | 257 | if (output->isConnected() && output->isEnabled() && output->currentMode().isNull()) { | ||
257 | qCDebug(KSCREEN_KDED) << "Current mode" << output->currentModeId() << "invalid, setting preferred mode" << output->preferredModeId(); | 258 | qCDebug(KSCREEN_KDED) << "Current mode" << output->currentModeId() << "invalid, setting preferred mode" << output->preferredModeId(); | ||
258 | output->setCurrentModeId(output->preferredModeId()); | 259 | output->setCurrentModeId(output->preferredModeId()); | ||
259 | doApplyConfig(m_monitoredConfig); | 260 | changed = true; | ||
261 | } | ||||
260 | } | 262 | } | ||
263 | if (changed) { | ||||
264 | doApplyConfig(m_monitoredConfig); | ||||
261 | } | 265 | } | ||
262 | 266 | | |||
263 | // Reset timer, delay the writeback | 267 | // Reset timer, delay the writeback | ||
264 | if (!m_saveTimer) { | 268 | if (!m_saveTimer) { | ||
265 | m_saveTimer = new QTimer(this); | 269 | m_saveTimer = new QTimer(this); | ||
266 | m_saveTimer->setInterval(300); | 270 | m_saveTimer->setInterval(300); | ||
267 | m_saveTimer->setSingleShot(true); | 271 | m_saveTimer->setSingleShot(true); | ||
268 | connect(m_saveTimer, &QTimer::timeout, this, &KScreenDaemon::saveCurrentConfig); | 272 | connect(m_saveTimer, &QTimer::timeout, this, &KScreenDaemon::saveCurrentConfig); | ||
▲ Show 20 Lines • Show All 192 Lines • Show Last 20 Lines |