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

Don't crash when no serial ports are available on Windows

Browse source
This commit is contained in:
Alessandro Ranellucci 2015-11-16 12:50:16 +01:00
parent 80620a5e94
commit e50bbc0245
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/Slic3r/GUI.pm
View file

@ -322,10 +322,14 @@ sub scan_serial_ports {
# Windows # Windows
if (eval "use Win32::TieRegistry; 1") { if (eval "use Win32::TieRegistry; 1") {
my $ts = Win32::TieRegistry->new("HKEY_LOCAL_MACHINE\\HARDWARE\\DEVICEMAP\\SERIALCOMM", my $ts = Win32::TieRegistry->new("HKEY_LOCAL_MACHINE\\HARDWARE\\DEVICEMAP\\SERIALCOMM",
{ Access => Win32::TieRegistry::KEY_READ() }); { Access => 'KEY_READ' });
if ($ts) {
# when no serial ports are available, the registry key doesn't exist and
# TieRegistry->new returns undef
$ts->Tie(\my %reg); $ts->Tie(\my %reg);
push @ports, sort values %reg; push @ports, sort values %reg;
} }
}
} else { } else {
# UNIX and OS X # UNIX and OS X
push @ports, glob '/dev/{ttyUSB,ttyACM,tty.,cu.,rfcomm}*'; push @ports, glob '/dev/{ttyUSB,ttyACM,tty.,cu.,rfcomm}*';