40 lines
2.1 KiB
Diff
40 lines
2.1 KiB
Diff
From 2e8c6d293d15345e7bfd37529557833fc010e064 Mon Sep 17 00:00:00 2001
|
|
From: "Queen Vinyl Da.i'gyu-Kazotetsu" <vinyldarkscratch@gmail.com>
|
|
Date: Mon, 29 Apr 2024 02:13:59 -0700
|
|
Subject: [PATCH 3/4] Fix additional Boost upgrade issues
|
|
|
|
---
|
|
src/slic3r/GUI/AuxiliaryDataViewModel.cpp | 2 +-
|
|
src/slic3r/GUI/MediaPlayCtrl.cpp | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/slic3r/GUI/AuxiliaryDataViewModel.cpp b/src/slic3r/GUI/AuxiliaryDataViewModel.cpp
|
|
index f68f73306..9bb8835bf 100644
|
|
--- a/src/slic3r/GUI/AuxiliaryDataViewModel.cpp
|
|
+++ b/src/slic3r/GUI/AuxiliaryDataViewModel.cpp
|
|
@@ -336,7 +336,7 @@ wxDataViewItemArray AuxiliaryModel::ImportFile(AuxiliaryModelNode* sel, wxArrayS
|
|
dir_path += "\\" + src_bfs_path.filename().generic_wstring();
|
|
|
|
boost::system::error_code ec;
|
|
- if (!fs::copy_file(src_bfs_path, fs::path(dir_path.ToStdWstring()), fs::copy_option::overwrite_if_exists, ec))
|
|
+ if (!fs::copy_file(src_bfs_path, fs::path(dir_path.ToStdWstring()), fs::copy_options::overwrite_existing, ec))
|
|
continue;
|
|
|
|
// Update model data
|
|
diff --git a/src/slic3r/GUI/MediaPlayCtrl.cpp b/src/slic3r/GUI/MediaPlayCtrl.cpp
|
|
index 45de6fe1a..762088431 100644
|
|
--- a/src/slic3r/GUI/MediaPlayCtrl.cpp
|
|
+++ b/src/slic3r/GUI/MediaPlayCtrl.cpp
|
|
@@ -840,7 +840,7 @@ bool MediaPlayCtrl::start_stream_service(bool *need_install)
|
|
auto file_dll = tools_dir + dll;
|
|
auto file_dll2 = plugins_dir + dll;
|
|
if (!boost::filesystem::exists(file_dll) || boost::filesystem::last_write_time(file_dll) != boost::filesystem::last_write_time(file_dll2))
|
|
- boost::filesystem::copy_file(file_dll2, file_dll, boost::filesystem::copy_option::overwrite_if_exists);
|
|
+ boost::filesystem::copy_file(file_dll2, file_dll, boost::filesystem::copy_options::overwrite_existing);
|
|
}
|
|
boost::process::child process_source(file_source, file_url2.ToStdWstring(), boost::process::start_dir(tools_dir),
|
|
boost::process::windows::create_no_window,
|
|
--
|
|
2.47.0
|
|
|