# # # patch "src/Guitone.cpp" # from [89062568418293dfe32c1c68eb47f5344f2a4393] # to [c0b4ae2403ec1d7d02411a375eec94d3e4f6c876] # # patch "src/util/Settings.cpp" # from [9cf93066e0b4925188cea8ad17e68095e491e6aa] # to [c721a0196b365efd6e237c976f4cd0a77a16025e] # ============================================================ --- src/Guitone.cpp 89062568418293dfe32c1c68eb47f5344f2a4393 +++ src/Guitone.cpp c0b4ae2403ec1d7d02411a375eec94d3e4f6c876 @@ -48,10 +48,6 @@ Guitone::Guitone(int argc, char** argv) setQuitOnLastWindowClosed(false); - setOrganizationName("Thomas Keller"); - setOrganizationDomain("thomaskeller.biz"); - setApplicationName("guitone"); - // check for updates immediatly on launch if (Settings::getBool("CheckForUpdates", true)) { ============================================================ --- src/util/Settings.cpp 9cf93066e0b4925188cea8ad17e68095e491e6aa +++ src/util/Settings.cpp c721a0196b365efd6e237c976f4cd0a77a16025e @@ -21,12 +21,18 @@ #include "Settings.h" #include "vocab.h" -Settings* Settings::instance = 0; +#include -Settings* Settings::singleton() +Settings * Settings::instance = 0; + +Settings * Settings::singleton() { if (!instance) { + QCoreApplication::setOrganizationName("Thomas Keller"); + QCoreApplication::setOrganizationDomain("thomaskeller.biz"); + QCoreApplication::setApplicationName("guitone"); + instance = new Settings(); } return instance;