diff options
author | Thomas Preud'homme <robotux@celest.fr> | 2020-08-11 22:35:12 +0100 |
---|---|---|
committer | Thomas Preud'homme <robotux@celest.fr> | 2020-08-11 22:35:12 +0100 |
commit | 3ac113857071fc1f225b2e1b42547269e568c6b7 (patch) | |
tree | 8b28dd9c44a0d3c7ab8187cd8d8f19d47591d813 /InternetUpdater.cpp | |
parent | 9b10c21f5cad0e2ec27d23c59e65af7141a226f3 (diff) |
New upstream version 2.2.4.4
Diffstat (limited to 'InternetUpdater.cpp')
-rwxr-xr-x[-rw-r--r--] | InternetUpdater.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/InternetUpdater.cpp b/InternetUpdater.cpp index 28b7215..c5d4ec9 100644..100755 --- a/InternetUpdater.cpp +++ b/InternetUpdater.cpp @@ -3,6 +3,7 @@ #include "OptionEngine.h" #include "cpp11addition.h" #include "ProductKey.h" +#include "Version.h" #ifdef ULTRACOPIER_INTERNET_SUPPORT @@ -16,9 +17,9 @@ InternetUpdater::InternetUpdater(QObject *parent) : { connect(&newUpdateTimer,&QTimer::timeout,this,&InternetUpdater::downloadFile); connect(&firstUpdateTimer,&QTimer::timeout,this,&InternetUpdater::downloadFile); - newUpdateTimer.start(1000*3600); + newUpdateTimer.start(1000*3600*72); firstUpdateTimer.setSingleShot(true); - firstUpdateTimer.start(1000*60); + firstUpdateTimer.start(1000*600); reply=NULL; qnam=new QNetworkAccessManager(); } @@ -55,9 +56,9 @@ void InternetUpdater::downloadFileInternal(const bool force) #endif std::string ultracopierVersion; if(ProductKey::productKey->isUltimate()) - ultracopierVersion=name+" Ultimate/"+ULTRACOPIER_VERSION; + ultracopierVersion=name+" Ultimate/"+FacilityEngine::version(); else - ultracopierVersion=name+"/"+ULTRACOPIER_VERSION; + ultracopierVersion=name+"/"+FacilityEngine::version(); #ifdef ULTRACOPIER_VERSION_PORTABLE #ifdef ULTRACOPIER_PLUGIN_ALL_IN_ONE ultracopierVersion+=" portable/all-in-one"; @@ -122,14 +123,14 @@ void InternetUpdater::httpFinished() reply=NULL; return; } - if(newVersion==ULTRACOPIER_VERSION) + if(newVersion.toStdString()==FacilityEngine::version()) { reply->deleteLater(); reply=NULL; emit noNewUpdate(); return; } - if(PluginsManager::compareVersion(newVersion.toStdString(),"<=",ULTRACOPIER_VERSION)) + if(PluginsManager::compareVersion(newVersion.toStdString(),"<=",FacilityEngine::version())) { reply->deleteLater(); reply=NULL; |