GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-07-04 14:55:10 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Follow-up on 550e5c2fbb3a5151e18b573f246fa78dcef8e964

Browse Source 
Fixed some spurious moves of data that should have not been moved.
This commit is contained in:
bubnikv 2020-03-12 12:57:46 +01:00
parent 3858257e28
commit b71161265f
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/slic3r/GUI/Plater.cpp
View File

@ -2200,7 +2200,7 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame)
% evt.data.first.name % evt.data.first.path).str()); % evt.data.first.name % evt.data.first.path).str());
} else } else
Slic3r::GUI::show_info(this->q, (boost::format(_utf8(L("Ejecting of device %s(%s) has failed."))) Slic3r::GUI::show_info(this->q, (boost::format(_utf8(L("Ejecting of device %s(%s) has failed.")))
% evt.data.first.name % evt.data.first.path).str()); % evt.data.first.name % evt.data.first.path).str());
}); });
this->q->Bind(EVT_REMOVABLE_DRIVES_CHANGED, [this](RemovableDrivesChangedEvent &) { this->show_action_buttons(this->ready_to_slice); }); this->q->Bind(EVT_REMOVABLE_DRIVES_CHANGED, [this](RemovableDrivesChangedEvent &) { this->show_action_buttons(this->ready_to_slice); });
// Start the background thread and register this window as a target for update events. // Start the background thread and register this window as a target for update events.

11
src/slic3r/GUI/RemovableDriveManager.cpp
View File

@ -91,7 +91,7 @@ void RemovableDriveManager::eject_drive()
std::cerr << "Ejecting " << mpath << " failed " << GetLastError() << " \n"; std::cerr << "Ejecting " << mpath << " failed " << GetLastError() << " \n";
assert(m_callback_evt_handler); assert(m_callback_evt_handler);
if (m_callback_evt_handler) if (m_callback_evt_handler)
wxPostEvent(m_callback_evt_handler, RemovableDriveEjectEvent(EVT_REMOVABLE_DRIVE_EJECTED, std::pair< DriveData, bool >(std::move(*it_drive_data), false))); wxPostEvent(m_callback_evt_handler, RemovableDriveEjectEvent(EVT_REMOVABLE_DRIVE_EJECTED, std::pair<DriveData, bool>(*it_drive_data, false)));
return; return;
} }
DWORD deviceControlRetVal(0); DWORD deviceControlRetVal(0);
@ -106,7 +106,7 @@ void RemovableDriveManager::eject_drive()
BOOST_LOG_TRIVIAL(error) << "Ejecting " << mpath << " failed " << deviceControlRetVal << " " << GetLastError() << " \n"; BOOST_LOG_TRIVIAL(error) << "Ejecting " << mpath << " failed " << deviceControlRetVal << " " << GetLastError() << " \n";
assert(m_callback_evt_handler); assert(m_callback_evt_handler);
if (m_callback_evt_handler) if (m_callback_evt_handler)
wxPostEvent(m_callback_evt_handler, RemovableDriveEjectEvent(EVT_REMOVABLE_DRIVE_EJECTED, std::pair< DriveData, bool >(std::move(*it_drive_data),false))); wxPostEvent(m_callback_evt_handler, RemovableDriveEjectEvent(EVT_REMOVABLE_DRIVE_EJECTED, std::pair<DriveData, bool>(*it_drive_data, false)));
return; return;
} }
CloseHandle(handle); CloseHandle(handle);
@ -364,19 +364,18 @@ void RemovableDriveManager::eject_drive()
// wait for command to finnish (blocks ui thread) // wait for command to finnish (blocks ui thread)
child.wait(); child.wait();
int err = child.exit_code(); int err = child.exit_code();
if(err) if (err) {
{
BOOST_LOG_TRIVIAL(error) << "Ejecting failed"; BOOST_LOG_TRIVIAL(error) << "Ejecting failed";
assert(m_callback_evt_handler); assert(m_callback_evt_handler);
if (m_callback_evt_handler) if (m_callback_evt_handler)
wxPostEvent(m_callback_evt_handler, RemovableDriveEjectEvent(EVT_REMOVABLE_DRIVE_EJECTED, std::pair< DriveData, bool >(std::move(*it_drive_data), false))); wxPostEvent(m_callback_evt_handler, RemovableDriveEjectEvent(EVT_REMOVABLE_DRIVE_EJECTED, std::pair<DriveData, bool>(*it_drive_data, false)));
return; return;
} }
BOOST_LOG_TRIVIAL(info) << "Ejecting finished"; BOOST_LOG_TRIVIAL(info) << "Ejecting finished";
assert(m_callback_evt_handler); assert(m_callback_evt_handler);
if (m_callback_evt_handler) if (m_callback_evt_handler)
wxPostEvent(m_callback_evt_handler, RemovableDriveEjectEvent(EVT_REMOVABLE_DRIVE_EJECTED, std::pair< DriveData, bool >(std::move(*it_drive_data), true))); wxPostEvent(m_callback_evt_handler, RemovableDriveEjectEvent(EVT_REMOVABLE_DRIVE_EJECTED, std::pair<DriveData, bool>(std::move(*it_drive_data), true)));
m_current_drives.erase(it_drive_data); m_current_drives.erase(it_drive_data);
} }
} }