PublicCodeMirror/OrcaSlicer-bambulab
1
0
Fork 0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-05-16 20:32:43 -07:00
Code Issues Packages Projects Releases Wiki Activity

Refactor catch(...) handlers in Http, OctoPrint, PrintHost, and Serial

Browse Source
This commit is contained in:
Vojtech Kral
2019-08-19 10:55:11 +02:00
parent baaf66d138
commit f937209619
4 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/slic3r/Utils/Serial.cpp
View File

@@ -6,6 +6,7 @@
#include <chrono>
#include <thread>
#include <fstream>
#include <exception>
#include <stdexcept>
#include <boost/algorithm/string/predicate.hpp>
@@ -71,13 +72,10 @@ void parse_hardware_id(const std::string &hardware_id, SerialPortInfo &spi)
std::regex pattern("USB\\\\.*VID_([[:xdigit:]]+)&PID_([[:xdigit:]]+).*");
std::smatch matches;
if (std::regex_match(hardware_id, matches, pattern)) {
try {
vid = std::stoul(matches[1].str(), 0, 16);
pid = std::stoul(matches[2].str(), 0, 16);
spi.id_vendor = vid;
spi.id_product = pid;
}
catch (...) {}
vid = std::stoul(matches[1].str(), 0, 16);
pid = std::stoul(matches[2].str(), 0, 16);
spi.id_vendor = vid;
spi.id_product = pid;
}
}
#endif