diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:23:19 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:23:19 +0200 |
| commit | 0887aee8c54d0ed51bb2031431e2bcdafebb4c6e (patch) | |
| tree | 69537ceb9787bb25ac363cc4e6cdaf0804d78363 /ui/check_version.cpp | |
| parent | 5.12 (diff) | |
| download | FreeFileSync-0887aee8c54d0ed51bb2031431e2bcdafebb4c6e.tar.gz FreeFileSync-0887aee8c54d0ed51bb2031431e2bcdafebb4c6e.tar.bz2 FreeFileSync-0887aee8c54d0ed51bb2031431e2bcdafebb4c6e.zip | |
5.13
Diffstat (limited to 'ui/check_version.cpp')
| -rw-r--r-- | ui/check_version.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/ui/check_version.cpp b/ui/check_version.cpp index 922708c7..e3ed042d 100644 --- a/ui/check_version.cpp +++ b/ui/check_version.cpp @@ -8,6 +8,7 @@ #include <memory> #include <zen/string_tools.h> #include <zen/i18n.h> +#include <zen/utf.h> #include <wx/msgdlg.h> #include <wx/protocol/http.h> #include <wx/sstream.h> @@ -15,7 +16,7 @@ #include <wx/timer.h> #include "msg_popup.h" #include "../version/version.h" -#include "../lib/ffs_paths.h" +//#include "../lib/ffs_paths.h" #include <zen/scope_guard.h> #ifdef FFS_WIN @@ -150,7 +151,7 @@ GetVerResult getOnlineVersion(wxString& version) //empty string on error; version = utfCvrtTo<wxString>(&output[0]); return GET_VER_SUCCESS; -#else +#elif defined FFS_LINUX || defined FFS_MAC wxWindowDisabler dummy; auto getStringFromUrl = [](const wxString& server, const wxString& page, int timeout, wxString* output) -> bool //true on successful connection @@ -246,11 +247,6 @@ void zen::checkForUpdateNow(wxWindow* parent) void zen::checkForUpdatePeriodically(wxWindow* parent, long& lastUpdateCheck) { -#ifdef FFS_LINUX - if (!zen::isPortableVersion()) //don't check for updates in locally installed version -> handled by system updater - return; -#endif - if (lastUpdateCheck != -1) { if (lastUpdateCheck == 0) |