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

Another fix or Unices of the previous commit.

Browse Source
This commit is contained in:
bubnikv 2017-11-02 16:35:46 +01:00
parent df5628422c
commit 7551006102
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
xs/src/slic3r/GUI/GUI.cpp
View File

@ -97,15 +97,16 @@ std::vector<std::string> scan_serial_ports()
} }
#else #else
// UNIX and OS X // UNIX and OS X
boost::filesystem::directory_iterator end;
std::initializer_list<const char*> prefixes { "ttyUSB" , "ttyACM", "tty.", "cu.", "rfcomm" }; std::initializer_list<const char*> prefixes { "ttyUSB" , "ttyACM", "tty.", "cu.", "rfcomm" };
for (boost::filesystem::directory_iterator it_path(boost::filesystem::path("/dev")); for (auto &file : boost::filesystem::directory_iterator(boost::filesystem::path("/dev"))) {
it_path != end; ++ it_path) std::string name = it->path().filename().string();
for (const char *prefix : prefixes) for (const char *prefix : prefixes) {
if (boost::starts_with(it_path->string(), std::string("/dev/") + prefix)) { if (boost::starts_with(name, prefix)) {
out.emplace_back(path); out.emplace_back(it->path().string());
break; break;
} }
}
}
#endif #endif
out.erase(std::remove_if(out.begin(), out.end(), out.erase(std::remove_if(out.begin(), out.end(),