mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: fix crash in get_firmware_info 

Change-Id: I26807cfc9f66f13c3b44efb24570f23817c8b829
This commit is contained in:
Stone Li 2022-10-08 10:38:34 +08:00 committed by Lane.Wei
parent c855cdaf54
commit ab261089d5
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/slic3r/GUI/DeviceManager.cpp
View File

@ -2673,8 +2673,12 @@ void MachineObject::update_slice_info(std::string project_id, std::string profil
void MachineObject::get_firmware_info() void MachineObject::get_firmware_info()
{ {
m_firmware_valid = false; m_firmware_valid = false;
if (m_firmware_thread_started)
return;
boost::thread update_info_thread = Slic3r::create_thread( boost::thread update_info_thread = Slic3r::create_thread(
[&] { [&] {
m_firmware_thread_started = true;
int result = 0; int result = 0;
unsigned int http_code; unsigned int http_code;
std::string http_body; std::string http_body;
@ -2745,6 +2749,7 @@ void MachineObject::get_firmware_info()
catch (...) { catch (...) {
return; return;
} }
m_firmware_thread_started = false;
m_firmware_valid = true; m_firmware_valid = true;
} }
); );

1
src/slic3r/GUI/DeviceManager.hpp
View File

@ -617,6 +617,7 @@ public:
void update_slice_info(std::string project_id, std::string profile_id, std::string subtask_id, int plate_idx); void update_slice_info(std::string project_id, std::string profile_id, std::string subtask_id, int plate_idx);
bool m_firmware_valid { false }; bool m_firmware_valid { false };
bool m_firmware_thread_started { false };
void get_firmware_info(); void get_firmware_info();
bool is_firmware_info_valid(); bool is_firmware_info_valid();
}; };