From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Thu, 22 Jan 2009 23:21:02 +0000 (+0100)
Subject: Don't show migration warnings if we don't have old settings to migrate
X-Git-Tag: 0.4.0~176
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=e94adb7dab9f1dfcb9f792912a365e6c72728d82

Don't show migration warnings if we don't have old settings to migrate
---

diff --git a/src/core/core.cpp b/src/core/core.cpp
index 38272e3e..aa4f692f 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -72,7 +72,6 @@ Core::Core() : storage(0) {
 #endif /* Q_WS_MAC */
 
   if(newSettings.value("Config/Version").toUInt() == 0) {
-    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";
 #   else
@@ -80,6 +79,7 @@ Core::Core() : storage(0) {
 #   endif
     QSettings oldSettings(org, "Quassel Core");
     if(oldSettings.allKeys().count()) {
+      qWarning() << "\n\n*** IMPORTANT: Config and data file locations have changed. Attempting to auto-migrate your core settings...";
       foreach(QString key, oldSettings.allKeys())
         newSettings.setValue(key, oldSettings.value(key));
       newSettings.setValue("Config/Version", 1);
diff --git a/src/qtui/qtuiapplication.cpp b/src/qtui/qtuiapplication.cpp
index 8acead9a..c1cf2c99 100644
--- a/src/qtui/qtuiapplication.cpp
+++ b/src/qtui/qtuiapplication.cpp
@@ -83,7 +83,6 @@ bool QtUiApplication::init() {
 #endif /* Q_WS_MAC */
 
     if(newSettings.value("Config/Version").toUInt() == 0) {
-      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";
 #     else
@@ -91,12 +90,13 @@ bool QtUiApplication::init() {
 #     endif
       QSettings oldSettings(org, "Quassel Client");
       if(oldSettings.allKeys().count()) {
+        qWarning() << "\n\n*** IMPORTANT: Config and data file locations have changed. Attempting to auto-migrate your client settings...";
         foreach(QString key, oldSettings.allKeys())
           newSettings.setValue(key, oldSettings.value(key));
         newSettings.setValue("Config/Version", 1);
         qWarning() << "*   Your client settings have been migrated to" << newFilePath;
+        qWarning() << "*** Migration completed.\n\n";
       }
-      qWarning() << "*** Migration completed.\n\n";
     }
 
     // MIGRATION end