diff options
| author | bubnikv <bubnikv@gmail.com> | 2020-03-12 14:57:46 +0300 |
|---|---|---|
| committer | bubnikv <bubnikv@gmail.com> | 2020-03-12 14:57:52 +0300 |
| commit | b71161265f33f718e9328db528f735993f99a887 (patch) | |
| tree | 2a8433a8886a6d6b3534ed394814ec1f9d658ec8 /src/slic3r/GUI | |
| parent | 3858257e28316de097f709bd6ce4eeaa075dba4a (diff) | |
Follow-up on 550e5c2fbb3a5151e18b573f246fa78dcef8e964
Fixed some spurious moves of data that should have not been moved.
Diffstat (limited to 'src/slic3r/GUI')
| -rw-r--r-- | src/slic3r/GUI/Plater.cpp | 2 | ||||
| -rw-r--r-- | src/slic3r/GUI/RemovableDriveManager.cpp | 11 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 2efa998af..461416869 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -2200,7 +2200,7 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame) % evt.data.first.name % evt.data.first.path).str()); } else 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); }); // Start the background thread and register this window as a target for update events. 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); } } |