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

Bugfix: failure in launching on Windows with non-ASCII characters in username. #1011

Browse source
This commit is contained in:
Alessandro Ranellucci 2013-02-22 18:40:00 +01:00
parent 28638019ae
commit 72df796185
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/Slic3r.pm
View file

@ -88,9 +88,14 @@ sub parallelize {
} }
} }
sub encode_path {
my ($filename) = @_;
return encode('locale_fs', $filename);
}
sub open { sub open {
my ($fh, $mode, $filename) = @_; my ($fh, $mode, $filename) = @_;
return CORE::open $$fh, $mode, encode('locale_fs', $filename); return CORE::open $$fh, $mode, encode_path($filename);
} }
1; 1;

7
lib/Slic3r/GUI.pm
View file

@ -55,14 +55,15 @@ sub OnInit {
# locate or create data directory # locate or create data directory
$datadir ||= Wx::StandardPaths::Get->GetUserDataDir; $datadir ||= Wx::StandardPaths::Get->GetUserDataDir;
Slic3r::debugf "Data directory: %s\n", $datadir; Slic3r::debugf "Data directory: %s\n", $datadir;
my $run_wizard = (-d $datadir) ? 0 : 1; my $encoded_datadir = Slic3r::encode_path($datadir);
for ($datadir, "$datadir/print", "$datadir/filament", "$datadir/printer") { my $run_wizard = (-d $encoded_datadir) ? 0 : 1;
for ($encoded_datadir, "$encoded_datadir/print", "$encoded_datadir/filament", "$encoded_datadir/printer") {
mkdir or $self->fatal_error("Slic3r was unable to create its data directory at $_ (errno: $!).") mkdir or $self->fatal_error("Slic3r was unable to create its data directory at $_ (errno: $!).")
unless -d $_; unless -d $_;
} }
# load settings # load settings
if (-f "$datadir/slic3r.ini") { if (-f "$encoded_datadir/slic3r.ini") {
my $ini = eval { Slic3r::Config->read_ini("$datadir/slic3r.ini") }; my $ini = eval { Slic3r::Config->read_ini("$datadir/slic3r.ini") };
$Settings = $ini if $ini; $Settings = $ini if $ini;
} }