summaryrefslogtreecommitdiff
path: root/freefilesync/debian/patches/ffs_allow_parallel_ops.patch
diff options
context:
space:
mode:
Diffstat (limited to 'freefilesync/debian/patches/ffs_allow_parallel_ops.patch')
-rw-r--r--freefilesync/debian/patches/ffs_allow_parallel_ops.patch17
1 files changed, 9 insertions, 8 deletions
diff --git a/freefilesync/debian/patches/ffs_allow_parallel_ops.patch b/freefilesync/debian/patches/ffs_allow_parallel_ops.patch
index dfe2c55..3a37ae3 100644
--- a/freefilesync/debian/patches/ffs_allow_parallel_ops.patch
+++ b/freefilesync/debian/patches/ffs_allow_parallel_ops.patch
@@ -1,5 +1,6 @@
-Version: 11.22
-Date: 2022-06-26
+Version: 12.3
+Date: 2023-05-19
+Author: bgstack15
Message: The source release appears not to actually include the logic that performs operations in parallel, so this patch doesn't actually do anything.
--- a/FreeFileSync/Source/ui/folder_selector.cpp
+++ b/FreeFileSync/Source/ui/folder_selector.cpp
@@ -10,11 +11,11 @@ Message: The source release appears not to actually include the logic that perfo
- size_t parallelOps = getDeviceParallelOps_ ? getDeviceParallelOps_(folderPathPhrase) : 1;
+ size_t parallelOps = getDeviceParallelOps_ ? getDeviceParallelOps_(folderPathPhrase) : 5;
- if (showCloudSetupDialog(parent_, folderPathPhrase, sftpKeyFileLastSelected_, parallelOps, static_cast<bool>(setDeviceParallelOps_)) != ConfirmationButton::accept)
- return;
+ const AbstractPath oldPath = createAbstractPath(folderPathPhrase);
+
--- a/FreeFileSync/Source/ui/small_dlgs.cpp
+++ b/FreeFileSync/Source/ui/small_dlgs.cpp
-@@ -371,11 +371,14 @@ CloudSetupDlg::CloudSetupDlg(wxWindow* p
+@@ -385,11 +385,14 @@ CloudSetupDlg::CloudSetupDlg(wxWindow* p
m_spinCtrlConnectionCount->SetValue(parallelOps);
@@ -33,7 +34,7 @@ Message: The source release appears not to actually include the logic that perfo
//---------------------------------------------------------
//set up default view for dialog size calculation
-@@ -821,7 +824,7 @@ CopyToDialog::CopyToDialog(wxWindow* par
+@@ -940,7 +943,7 @@ CopyToDialog::CopyToDialog(wxWindow* par
targetFolder = std::make_unique<FolderSelector>(this, *this, *m_buttonSelectTargetFolder, *m_bpButtonSelectAltTargetFolder, *m_targetFolderPath,
targetFolderLastSelected, sftpKeyFileLastSelected, nullptr /*staticText*/, nullptr /*wxWindow*/, nullptr /*droppedPathsFilter*/,
@@ -44,10 +45,10 @@ Message: The source release appears not to actually include the logic that perfo
--- a/FreeFileSync/Source/ui/sync_cfg.cpp
+++ b/FreeFileSync/Source/ui/sync_cfg.cpp
-@@ -352,7 +352,7 @@ emailHistoryOut_(emailHistory),
- commandHistoryOut_(commandHistory),
+@@ -476,7 +476,7 @@ commandHistoryOut_(commandHistory),
globalPairCfg_(globalPairCfg),
localPairCfg_(localPairCfg),
+ showNotesPanel_(!globalPairCfg.miscCfg.notes.empty()),
- enableExtraFeatures_(false),
+ enableExtraFeatures_(true),
showMultipleCfgs_(showMultipleCfgs),
bgstack15