diff options
Diffstat (limited to 'src/slic3r/GUI/RemovableDriveManager.cpp')
| -rw-r--r-- | src/slic3r/GUI/RemovableDriveManager.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/slic3r/GUI/RemovableDriveManager.cpp b/src/slic3r/GUI/RemovableDriveManager.cpp index 9ffb4d9c9..d1f49f089 100644 --- a/src/slic3r/GUI/RemovableDriveManager.cpp +++ b/src/slic3r/GUI/RemovableDriveManager.cpp @@ -91,7 +91,7 @@ void RemovableDriveManager::eject_drive() std::cerr << "Ejecting " << mpath << " failed " << GetLastError() << " \n"; assert(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; } DWORD deviceControlRetVal(0); @@ -106,7 +106,7 @@ void RemovableDriveManager::eject_drive() BOOST_LOG_TRIVIAL(error) << "Ejecting " << mpath << " failed " << deviceControlRetVal << " " << GetLastError() << " \n"; assert(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; } CloseHandle(handle); @@ -364,19 +364,18 @@ void RemovableDriveManager::eject_drive() // wait for command to finnish (blocks ui thread) child.wait(); int err = child.exit_code(); - if(err) - { + if (err) { BOOST_LOG_TRIVIAL(error) << "Ejecting failed"; assert(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; } BOOST_LOG_TRIVIAL(info) << "Ejecting finished"; assert(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); } } |