3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-12 01:07:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'dk_remote_devices' of https://github.com/prusa3d/PrusaSlicer into dk_remote_devices

Browse source
This commit is contained in:
David Kocik 2019-12-19 16:28:28 +01:00
commit 58a8e9e7e0
2 changed files with 23 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/slic3r/GUI/RemovableDriveManager.cpp
View file

@ -457,7 +457,11 @@ bool RemovableDriveManager::update(const long time,const bool check)
}
}
search_for_drives();
if(check)check_and_notify();
if (m_drives_count != m_current_drives.size())
{
if (check)check_and_notify();
m_drives_count = m_current_drives.size();
}
return !m_current_drives.empty();
}
@ -499,16 +503,12 @@ std::vector<DriveData> RemovableDriveManager::get_all_drives()
}
void RemovableDriveManager::check_and_notify()
{
if(m_drives_count != m_current_drives.size())
if(m_callbacks.size() != 0 && m_drives_count > m_current_drives.size() && m_last_save_path_verified && !is_drive_mounted(m_last_save_path))
{
if(m_callbacks.size() != 0 && m_drives_count > m_current_drives.size() && m_last_save_path_verified && !is_drive_mounted(m_last_save_path))
for (auto it = m_callbacks.begin(); it != m_callbacks.end(); ++it)
{
for (auto it = m_callbacks.begin(); it != m_callbacks.end(); ++it)
{
(*it)();
}
(*it)();
}
m_drives_count = m_current_drives.size();
}
}
void RemovableDriveManager::add_callback(std::function<void()> callback)
@ -532,6 +532,9 @@ void RemovableDriveManager::verify_last_save_path()
m_last_save_path_verified = true;
m_last_save_path = last_drive;
m_last_save_name = get_drive_name(last_drive);
}else
{
reset_last_save_path();
}
}
std::string RemovableDriveManager::get_drive_name(const std::string& path)