summaryrefslogtreecommitdiff
path: root/freefilesync/debian/patches/ffs_allow_parallel_ops.patch
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2020-02-18 16:02:40 +0000
committerB Stack <bgstack15@gmail.com>2020-02-18 16:02:40 +0000
commit819051f5d8489d6193a56b5d02c3b9d21fe41775 (patch)
treea5aecb01558219c0d302312fd8bc4d4766d2d3e9 /freefilesync/debian/patches/ffs_allow_parallel_ops.patch
parentMerge branch 'mktrayicon-bump' into 'master' (diff)
parentfix libssh2 patch for rpm to match it for dpkg (diff)
downloadstackrpms-819051f5d8489d6193a56b5d02c3b9d21fe41775.tar.gz
stackrpms-819051f5d8489d6193a56b5d02c3b9d21fe41775.tar.bz2
stackrpms-819051f5d8489d6193a56b5d02c3b9d21fe41775.zip
Merge branch 'freefilesync-bump' into 'master'
FreeFileSync 10.20 Closes #14 See merge request bgstack15/stackrpms!126
Diffstat (limited to 'freefilesync/debian/patches/ffs_allow_parallel_ops.patch')
-rw-r--r--freefilesync/debian/patches/ffs_allow_parallel_ops.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/freefilesync/debian/patches/ffs_allow_parallel_ops.patch b/freefilesync/debian/patches/ffs_allow_parallel_ops.patch
index e464662..3d8197f 100644
--- a/freefilesync/debian/patches/ffs_allow_parallel_ops.patch
+++ b/freefilesync/debian/patches/ffs_allow_parallel_ops.patch
@@ -13,13 +13,13 @@ diff -x '*.orig' -x '*.swp' -x '*.rej' -Naur 10.9-0/FreeFileSync/Source/ui/folde
return;
diff -Naur -x '*.orig' -x '*.rej' 10.9-0/FreeFileSync/Source/ui/sync_cfg.cpp 10.9-1/FreeFileSync/Source/ui/sync_cfg.cpp
--- 10.9-0/FreeFileSync/Source/ui/sync_cfg.cpp 2019-02-10 22:01:42.075159451 -0500
-+++ 10.9-1/FreeFileSync/Source/ui/sync_cfg.cpp 2019-02-11 21:25:11.685992654 -0500
-@@ -263,7 +263,7 @@
++++ 10.20-1/FreeFileSync/Source/ui/sync_cfg.cpp 2019-02-11 21:25:11.685992654 -0500
+@@ -283,7 +283,7 @@
+ commandHistoryOut_(commandHistory),
globalPairCfg_(globalPairCfg),
localPairCfg_(localPairConfig),
- showMultipleCfgs_(showMultipleCfgs),
--perfPanelActive_(false),
-+perfPanelActive_(true),
- commandHistItemsMax_(commandHistItemsMax)
+-enableExtraFeatures_(false),
++enableExtraFeatures_(true),
+ showMultipleCfgs_(showMultipleCfgs)
{
setStandardButtonLayout(*bSizerStdButtons, StdButtons().setAffirmative(m_buttonOkay).setCancel(m_buttonCancel));
bgstack15