Sfoglia il codice sorgente

Config: Fix loading of configuration

There is a strange bug with Qt, we need to always set the application name, then
we can generate the proper config path.
Markus Goetz 11 anni fa
parent
commit
c313cc02f2
2 ha cambiato i file con 5 aggiunte e 5 eliminazioni
  1. 1 1
      doc/ocdoc
  2. 4 4
      src/mirall/mirallconfigfile.cpp

+ 1 - 1
doc/ocdoc

@@ -1 +1 @@
-Subproject commit c612df399e3c775a2f9db1dc5e39d25920ab467b
+Subproject commit a8fc638c26dd47925e66f05fb87cface5dbbbd81

+ 4 - 4
src/mirall/mirallconfigfile.cpp

@@ -69,6 +69,9 @@ bool    MirallConfigFile::_askedUser = false;
 
 MirallConfigFile::MirallConfigFile()
 {
+    // QDesktopServices uses the application name to create a config path
+    qApp->setApplicationName( Theme::instance()->appNameGUI() );
+
     QSettings::setDefaultFormat(QSettings::IniFormat);
 
     const QString config = configFile();
@@ -77,7 +80,7 @@ MirallConfigFile::MirallConfigFile()
     QSettings settings(config, QSettings::IniFormat);
     settings.beginGroup( defaultConnection() );
 
-    // qDebug() << "Loading config: " << config << " (URL is " << settings.value("url").toString() << ")";
+    // qDebug() << Q_FUNC_INFO << "Loading config: " << config << " (URL is " << settings.value("url").toString() << ")";
 }
 
 void MirallConfigFile::setConfDir(const QString &value)
@@ -243,9 +246,6 @@ QString MirallConfigFile::excludeFile(Scope scope) const
 
 QString MirallConfigFile::configFile() const
 {
-    if( qApp->applicationName().isEmpty() ) {
-        qApp->setApplicationName( Theme::instance()->appNameGUI() );
-    }
     return configPath() + Theme::instance()->configFileName();
 }