Merge branch '10.4' into 'master'10.4

pull in latest 10.4 from upstream

See merge request opensource-tracking/FreeFileSync!1

1 files changed, 2 insertions, 2 deletions

diff --git a/wx+/image_resources.cpp b/wx+/image_resources.cpp
index bbeeff8b..d0449fe5 100755
--- a/wx+/image_resources.cpp
+++ b/wx+/image_resources.cpp
@@ -106,7 +106,7 @@ class DpiParallelScaler
 public:
     DpiParallelScaler(int hqScale) : hqScale_(hqScale) { assert(hqScale > 1); }
 
-    ~DpiParallelScaler() { threadGroup_ = zen::NoValue(); } //DpiParallelScaler must out-live threadGroup!!!
+    ~DpiParallelScaler() { threadGroup_ = {}; } //DpiParallelScaler must out-live threadGroup!!!
 
     void add(const wxString& name, const wxImage& img)
     {
@@ -141,7 +141,7 @@ private:
     Protected<std::vector<std::pair<std::wstring, ImageHolder>>> result_;
 
     using TaskType = FunctionReturnTypeT<decltype(&getScalerTask)>;
-    Opt<ThreadGroup<TaskType>> threadGroup_{ ThreadGroup<TaskType>(std::max<int>(std::thread::hardware_concurrency(), 1), "xBRZ Scaler") };
+    std::optional<ThreadGroup<TaskType>> threadGroup_{ ThreadGroup<TaskType>(std::max<int>(std::thread::hardware_concurrency(), 1), "xBRZ Scaler") };
     //hardware_concurrency() == 0 if "not computable or well defined"
 };