# # # patch "src/GuitoneCore.cpp" # from [9f73d621d82199126a1b9dfd09065e110feb15f1] # to [9a3f1bcbf6a588c168628ca225fb3cea16125c97] # # patch "src/GuitoneCore.h" # from [f864aa5b661a4f374fe46404cca99d54b9f183b4] # to [dc1e7b4aeccdc5c92393d2a5a5b1fe2bd4de78ad] # ============================================================ --- src/GuitoneCore.cpp 9f73d621d82199126a1b9dfd09065e110feb15f1 +++ src/GuitoneCore.cpp 9a3f1bcbf6a588c168628ca225fb3cea16125c97 @@ -30,11 +30,6 @@ GuitoneCore::GuitoneCore(int & argc, cha GuitoneCore::GuitoneCore(int & argc, char ** argv) : QApplication(argc, argv), monotoneManager(0), updateDialog(0) { - // check for updates immediatly on launch - if (Settings::getBool("CheckForUpdates")) - { - checkForApplicationUpdates(true); - } monotoneManager = new MonotoneManager(); @@ -43,7 +38,7 @@ GuitoneCore::GuitoneCore(int & argc, cha this, SLOT(threadAborted(const QString &)) ); - QTimer::singleShot(0, this, SLOT(setMonotoneBinaryPath())); + QTimer::singleShot(0, this, SLOT(appSetup())); } GuitoneCore::~GuitoneCore() @@ -52,8 +47,13 @@ GuitoneCore::~GuitoneCore() if (updateDialog) delete updateDialog; } -void GuitoneCore::setMonotoneBinaryPath() +void GuitoneCore::appSetup() { + if (Settings::getBool("CheckForUpdates")) + { + checkForApplicationUpdates(true); + } + if (monotoneManager->monotoneBinaryPathSet()) { W("monotone binary path already set"); ============================================================ --- src/GuitoneCore.h f864aa5b661a4f374fe46404cca99d54b9f183b4 +++ src/GuitoneCore.h dc1e7b4aeccdc5c92393d2a5a5b1fe2bd4de78ad @@ -45,10 +45,10 @@ private slots: virtual void threadAborted(const QString &); private slots: - void setMonotoneBinaryPath(); + void appSetup(); private: - bool notify (QObject *, QEvent *); + bool notify(QObject *, QEvent *); MonotoneManager * monotoneManager; ApplicationUpdate * updateDialog;