From eb409bdab8c149e7f950d3c3e7de137e79fc84d1 Mon Sep 17 00:00:00 2001 From: hjk <qtc-committer@nokia.com> Date: Fri, 26 Jun 2009 13:40:16 +0200 Subject: [PATCH] debugger: attempty to work around old ini files containing @Invalid() entries --- src/libs/utils/savedaction.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/libs/utils/savedaction.cpp b/src/libs/utils/savedaction.cpp index 7eea0711da2..f0337c0bdd3 100644 --- a/src/libs/utils/savedaction.cpp +++ b/src/libs/utils/savedaction.cpp @@ -243,8 +243,13 @@ void SavedAction::readSettings(QSettings *settings) if (m_settingsGroup.isEmpty() || m_settingsKey.isEmpty()) return; settings->beginGroup(m_settingsGroup); - setValue(settings->value(m_settingsKey, m_defaultValue), false); - //qDebug() << "READING: " << m_settingsKey << " -> " << m_value; + QVariant var = settings->value(m_settingsKey, m_defaultValue); + // work around old ini files containing @Invalid() entries + if (isCheckable() && !var.isValid()) + var = false; + setValue(var); + //qDebug() << "READING: " << var.isValid() << m_settingsKey << " -> " << m_value + // << " (default: " << m_defaultValue << ")" << var; settings->endGroup(); } -- GitLab