forked from pool/FreeFileSync
Eric Schirra
f1ca225155
- update to 9.8 - New option to auto-close progress dialog - Update last sync time if no differences found - Added 5 seconds countdown before shutdown/sleep - Preserve XML attribute creation order - Support HTTPS web accesses without redirect - Connect network share upon logon type not granted - Fixed invalid pointer error when reading MTP - Fixed temporary db file triggering RealTimeSync - Fixed runtime error during uninstallation - Continue status updates during sync cancellation - Log number of items found during comparison - Warn about outdated nviewH64.dll instead of crashing - Show default log file path when saving a batch job - Consider only full days for time since last sync - rebase patch freefilesync-build.patch - fix build for openSUSE_Leap_15.0 OBS-URL: https://build.opensuse.org/request/show/580307 OBS-URL: https://build.opensuse.org/package/show/network/FreeFileSync?expand=0&rev=27
50 lines
2.1 KiB
Diff
50 lines
2.1 KiB
Diff
diff -Naur FreeFileSync_9.8_Source_orig/FreeFileSync/Source/lib/dir_lock.cpp FreeFileSync_9.8_Source/FreeFileSync/Source/lib/dir_lock.cpp
|
|
--- FreeFileSync_9.8_Source_orig/FreeFileSync/Source/lib/dir_lock.cpp 2018-02-06 17:36:09.000000000 +0100
|
|
+++ FreeFileSync_9.8_Source/FreeFileSync/Source/lib/dir_lock.cpp 2018-02-25 10:32:21.437527408 +0100
|
|
@@ -22,6 +22,8 @@
|
|
#include <signal.h> //kill()
|
|
#include <pwd.h> //getpwuid_r()
|
|
|
|
+#include <zen/warn_static.h>
|
|
+
|
|
using namespace zen;
|
|
using namespace fff;
|
|
|
|
diff -Naur FreeFileSync_9.8_Source_orig/FreeFileSync/Source/ui/main_dlg.cpp FreeFileSync_9.8_Source/FreeFileSync/Source/ui/main_dlg.cpp
|
|
--- FreeFileSync_9.8_Source_orig/FreeFileSync/Source/ui/main_dlg.cpp 2018-02-06 17:36:08.000000000 +0100
|
|
+++ FreeFileSync_9.8_Source/FreeFileSync/Source/ui/main_dlg.cpp 2018-02-25 10:31:52.414217565 +0100
|
|
@@ -4821,13 +4821,13 @@
|
|
|
|
m_menuItemCheckVersionAuto->Check(updateCheckActive(globalCfg_.gui.lastUpdateCheck));
|
|
|
|
- if (shouldRunAutomaticUpdateCheck(globalCfg_.gui.lastUpdateCheck))
|
|
+ /* if (shouldRunAutomaticUpdateCheck(globalCfg_.gui.lastUpdateCheck))
|
|
{
|
|
flashStatusInformation(_("Searching for program updates..."));
|
|
//synchronous update check is sufficient here:
|
|
automaticUpdateCheckEval(this, globalCfg_.gui.lastUpdateCheck, globalCfg_.gui.lastOnlineVersion,
|
|
automaticUpdateCheckRunAsync(automaticUpdateCheckPrepare().get()).get());
|
|
- }
|
|
+ } */
|
|
}
|
|
|
|
|
|
@@ -4836,7 +4836,7 @@
|
|
//execute just once per startup!
|
|
Disconnect(wxEVT_IDLE, wxIdleEventHandler(MainDialog::OnRegularUpdateCheck), nullptr, this);
|
|
|
|
- if (shouldRunAutomaticUpdateCheck(globalCfg_.gui.lastUpdateCheck))
|
|
+ /* if (shouldRunAutomaticUpdateCheck(globalCfg_.gui.lastUpdateCheck))
|
|
{
|
|
flashStatusInformation(_("Searching for program updates..."));
|
|
|
|
@@ -4848,7 +4848,7 @@
|
|
automaticUpdateCheckEval(this, globalCfg_.gui.lastUpdateCheck, globalCfg_.gui.lastOnlineVersion,
|
|
resultAsync.get()); //run on main thread:
|
|
});
|
|
- }
|
|
+ } */
|
|
}
|
|
|
|
|