# # # patch "src/Guitone.cpp" # from [2744ce2f9b507bfc9431b85a99677f27302c355e] # to [89062568418293dfe32c1c68eb47f5344f2a4393] # # patch "src/util/CocoaUtil.h" # from [7bab17bbe14218ea6e1dc33bbca110c0cc13a248] # to [7b1611c0ccab481cdc10573da9ba91827da3f6c4] # # patch "src/util/CocoaUtil.mm" # from [5fe5b302f4e7198a04700856bab989b3b7e2f44c] # to [7ab47844aabb50917ff1c86d7aec4dca1ab93872] # ============================================================ --- src/Guitone.cpp 2744ce2f9b507bfc9431b85a99677f27302c355e +++ src/Guitone.cpp 89062568418293dfe32c1c68eb47f5344f2a4393 @@ -42,6 +42,8 @@ Guitone::Guitone(int argc, char** argv) { #ifndef Q_WS_MACX updateDialog = 0; +#else + CocoaUtil::initialize(); #endif setQuitOnLastWindowClosed(false); @@ -68,7 +70,9 @@ Guitone::~Guitone() Guitone::~Guitone() { I(openWindows.size() == 0); +#ifndef Q_WS_MACX if (updateDialog) delete updateDialog; +#endif } void Guitone::loadSomething() @@ -344,7 +348,7 @@ void Guitone::checkForApplicationUpdates void Guitone::checkForApplicationUpdates(bool silent) { #ifdef Q_WS_MACX - CocoaUtil::checkForUpdates(); + CocoaUtil::checkForUpdates(silent); #else if (!updateDialog) { ============================================================ --- src/util/CocoaUtil.h 7bab17bbe14218ea6e1dc33bbca110c0cc13a248 +++ src/util/CocoaUtil.h 7b1611c0ccab481cdc10573da9ba91827da3f6c4 @@ -9,10 +9,10 @@ class SUUpdater; class SUUpdater; -namespace CocoaUtil +namespace CocoaUtil { - void initialize(); - void checkForUpdates(); + void initialize(); + void checkForUpdates(bool); }; #endif ============================================================ --- src/util/CocoaUtil.mm 5fe5b302f4e7198a04700856bab989b3b7e2f44c +++ src/util/CocoaUtil.mm 7ab47844aabb50917ff1c86d7aec4dca1ab93872 @@ -9,14 +9,15 @@ void CocoaUtil::initialize() void CocoaUtil::initialize() { - NSApplicationLoad(); - SUUpdater * updater = [SUUpdater alloc]; - [updater checkForUpdatesInBackground]; + NSApplicationLoad(); } -void CocoaUtil::checkForUpdates() +void CocoaUtil::checkForUpdates(bool silent) { - SUUpdater * updater = [SUUpdater alloc]; - [updater checkForUpdates:nil]; + SUUpdater * updater = [SUUpdater alloc]; + if (silent) + [updater checkForUpdatesInBackground]; + else + [updater checkForUpdates:nil]; }