Wupps, fixed an oooopsie with the migration code :)

diff --git a/src/core/core.cpp b/src/core/core.cpp
index bf0395e..2724378 100644 (file)
--- 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);
 
   + ((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";
     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 d9165ba..9a99d9b 100644 (file)
--- 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);
 
     + ((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";
       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";