From: Manuel Nickschas Date: Tue, 20 Jan 2009 21:46:32 +0000 (+0100) Subject: Wupps, fixed an oooopsie with the migration code :) X-Git-Tag: 0.4.0~188 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=16f8531e383eade0a75a3b74ea11b909b8b1e049;hp=366f5e334c898bef4b88605cf5cf2ee2feabffb1;ds=sidebyside Wupps, fixed an oooopsie with the migration code :) --- diff --git a/src/core/core.cpp b/src/core/core.cpp index bf0395ed..27243780 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -66,7 +66,7 @@ Core::Core() : storage(0) { + ((format == QSettings::NativeFormat) ? QLatin1String(".conf") : QLatin1String(".ini")); QSettings newSettings(newFilePath, format); - if(newSettings.value("General/Version").toUInt() != 1) { + if(newSettings.value("Config/Version").toUInt() != 1) { qWarning() << "\n\n*** IMPORTANT: Config and data file locations have changed. Attempting to auto-migrate your core settings..."; # ifdef Q_WS_MAC QString org = "quassel-irc.org"; diff --git a/src/qtui/qtuiapplication.cpp b/src/qtui/qtuiapplication.cpp index d9165ba5..9a99d9bb 100644 --- a/src/qtui/qtuiapplication.cpp +++ b/src/qtui/qtuiapplication.cpp @@ -75,7 +75,7 @@ bool QtUiApplication::init() { + ((format == QSettings::NativeFormat) ? QLatin1String(".conf") : QLatin1String(".ini")); QSettings newSettings(newFilePath, format); - if(newSettings.value("General/Version").toUInt() != 1) { + if(newSettings.value("Config/Version").toUInt() != 1) { qWarning() << "\n\n*** IMPORTANT: Config and data file locations have changed. Attempting to auto-migrate your client settings..."; # ifdef Q_WS_MAC QString org = "quassel-irc.org";