3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed crash on removable device plug in event due to recent

Browse source 
RemovableDriveManager refactoring.
This commit is contained in:
bubnikv 2020-03-07 10:17:58 +01:00
parent 2363f2a4a3
commit 5052ef88db
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -37,10 +37,7 @@ std::vector<DriveData> RemovableDriveManager::search_for_removable_drives() cons
// Allocate the buffers before the loop. // Allocate the buffers before the loop.
std::wstring volume_name; std::wstring volume_name;
volume_name.resize(MAX_PATH + 1);
std::wstring file_system_name; std::wstring file_system_name;
file_system_name.resize(MAX_PATH + 1);
// Iterate the Windows drives from 'A' to 'Z' // Iterate the Windows drives from 'A' to 'Z'
std::vector<DriveData> current_drives; std::vector<DriveData> current_drives;
for (size_t i = 0; i < 26; ++ i) for (size_t i = 0; i < 26; ++ i)
@ -51,6 +48,8 @@ std::vector<DriveData> RemovableDriveManager::search_for_removable_drives() cons
if (drive_type == DRIVE_REMOVABLE) { if (drive_type == DRIVE_REMOVABLE) {
// get name of drive // get name of drive
std::wstring wpath = boost::nowide::widen(path); std::wstring wpath = boost::nowide::widen(path);
volume_name.resize(MAX_PATH + 1);
file_system_name.resize(MAX_PATH + 1);
BOOL error = ::GetVolumeInformationW(wpath.c_str(), volume_name.data(), sizeof(volume_name), nullptr, nullptr, nullptr, file_system_name.data(), sizeof(file_system_name)); BOOL error = ::GetVolumeInformationW(wpath.c_str(), volume_name.data(), sizeof(volume_name), nullptr, nullptr, nullptr, file_system_name.data(), sizeof(file_system_name));
if (error != 0) { if (error != 0) {
volume_name.erase(volume_name.begin() + wcslen(volume_name.c_str()), volume_name.end()); volume_name.erase(volume_name.begin() + wcslen(volume_name.c_str()), volume_name.end());