Merge branch 'release/2.2.1' into develop

2017-07-20 14:15:14 +02:00
parent 3b23e68540 f71d0c0da8
commit 90468e8095
17 changed files with 303 additions and 113 deletions
--- a/src/core/Config.cpp
+++ b/src/core/Config.cpp
@@ -107,6 +107,7 @@ void Config::init(const QString& fileName)
 {
    m_settings.reset(new QSettings(fileName, QSettings::IniFormat));

+    m_defaults.insert("SingleInstance", true);
    m_defaults.insert("RememberLastDatabases", true);
    m_defaults.insert("RememberLastKeyFiles", true);
    m_defaults.insert("OpenPreviousDatabasesOnStartup", true);