diff options
| author |   Unit 193 <unit193@ubuntu.com> | 2014-12-14 08:24:32 -0500 |
|---|---|---|
| committer | Unit 193 <unit193@ubuntu.com> | 2014-12-14 08:24:32 -0500 |
| commit | e571839e140139a6a819077e94cf8cc01c13b29f (patch) | |
| tree | 8263635257cfb5ed979a584a958103b700bf31e7 /SQLiteStudio3/coreSQLiteStudio/services | |
| parent | 407eac41f46936e3f346bb5a964a682e578b4237 (diff) | |
| parent | 89214766d8e3e7b8dd749a1fa18a5b9727f5010d (diff) | |
Merge tag 'upstream/3.0.0'
Upstream version 3.0.0
# gpg: Signature made Sun 14 Dec 2014 08:24:31 AM EST using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg: aka "Unit 193 <unit193@ninthfloor.org>"
# gpg: aka "Unit 193 <unit193@ubuntu.com>"
Diffstat (limited to 'SQLiteStudio3/coreSQLiteStudio/services')
| -rw-r--r-- | SQLiteStudio3/coreSQLiteStudio/services/functionmanager.h | 1 | ||||
| -rw-r--r-- | SQLiteStudio3/coreSQLiteStudio/services/updatemanager.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/SQLiteStudio3/coreSQLiteStudio/services/functionmanager.h b/SQLiteStudio3/coreSQLiteStudio/services/functionmanager.h index b848c93..2581b4f 100644 --- a/SQLiteStudio3/coreSQLiteStudio/services/functionmanager.h +++ b/SQLiteStudio3/coreSQLiteStudio/services/functionmanager.h @@ -7,6 +7,7 @@ #include <QSharedPointer> #include <QObject> #include <QStringList> +#include <functional> class Db; diff --git a/SQLiteStudio3/coreSQLiteStudio/services/updatemanager.cpp b/SQLiteStudio3/coreSQLiteStudio/services/updatemanager.cpp index dae8238..66620f3 100644 --- a/SQLiteStudio3/coreSQLiteStudio/services/updatemanager.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/services/updatemanager.cpp @@ -153,7 +153,7 @@ void UpdateManager::handleAvailableUpdatesReply(QNetworkReply* reply) void UpdateManager::getUpdatesMetadata(QNetworkReply*& replyStoragePointer) { #ifndef NO_AUTO_UPDATES - if (!isPlatformEligibleForUpdate() || replyStoragePointer) + if (!CFG_CORE.General.CheckUpdatesOnStartup.get() || !isPlatformEligibleForUpdate() || replyStoragePointer) return; QUrlQuery query; |