From f16d2f337e5d597256dcdb6043e2029b22ddecd8 Mon Sep 17 00:00:00 2001
From: "chunmao.guo" <chunmao.guo@bambulab.com>
Date: Tue, 18 Oct 2022 17:36:29 +0800
Subject: [PATCH] FIX: add process id to save file name

Change-Id: I359d75ef4f7f63e6f5eb5138f18921faa09593fa
---
 src/libslic3r/Model.cpp    | 2 ++
 src/slic3r/GUI/GUI_App.cpp | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/libslic3r/Model.cpp b/src/libslic3r/Model.cpp
index 2451cca7c..152d91fce 100644
--- a/src/libslic3r/Model.cpp
+++ b/src/libslic3r/Model.cpp
@@ -755,12 +755,14 @@ std::string Model::get_backup_path()
 {
     if (backup_path.empty())
     {
+        auto pid = get_current_pid();
         boost::filesystem::path parent_path(temporary_dir());
         std::time_t t = std::time(0);
         std::tm* now_time = std::localtime(&t);
         std::stringstream buf;
         buf << "/bamboo_model/";
         buf << std::put_time(now_time, "%a_%b_%d/%H_%M_%S#");
+        buf << pid << "#";
         buf << this->id().id;
 
         backup_path = parent_path.string() + buf.str();
diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
index d33ef46d1..435ef5104 100644
--- a/src/slic3r/GUI/GUI_App.cpp
+++ b/src/slic3r/GUI/GUI_App.cpp
@@ -1942,7 +1942,8 @@ bool GUI_App::on_init_inner()
     std::time_t t = std::time(0);
     std::tm* now_time = std::localtime(&t);
     std::stringstream buf;
-    buf << std::put_time(now_time, "debug_%a_%b_%d_%H_%M_%S.log");
+    buf << std::put_time(now_time, "debug_%a_%b_%d_%H_%M_%S_");
+    buf << get_current_pid() << ".log";
     std::string log_filename = buf.str();
 #if !BBL_RELEASE_TO_PUBLIC
     set_log_path_and_level(log_filename, 5);