Fixed no-gui flag.

This commit is contained in:
Joseph Lenox 2017-09-03 13:37:09 -05:00
parent c84bc71361
commit d6c44bd68f

View File

@ -29,7 +29,7 @@ my %cli_options = ();
'debug' => \$Slic3r::debug, 'debug' => \$Slic3r::debug,
'gui' => \$opt{gui}, 'gui' => \$opt{gui},
'no-gui' => \$opt{no_gui}, 'no-gui' => \$opt{no_gui},
'o|output=s' => \$opt{output}, 'o|output=s' => \$opt{output},
'j|threads=i' => \$opt{threads}, 'j|threads=i' => \$opt{threads},
@ -106,7 +106,7 @@ if ($opt{save}) {
# launch GUI # launch GUI
my $gui; my $gui;
if ((!@ARGV || $opt{gui}) && !(!@ARGV || $opt{no_gui}) && !$opt{save} && eval "require Slic3r::GUI; 1") { if ((!@ARGV || $opt{gui}) && !$opt{no_gui} && !$opt{save} && eval "require Slic3r::GUI; 1") {
{ {
no warnings 'once'; no warnings 'once';
$Slic3r::GUI::datadir = Slic3r::decode_path($opt{datadir} // ''); $Slic3r::GUI::datadir = Slic3r::decode_path($opt{datadir} // '');
@ -126,7 +126,7 @@ if ((!@ARGV || $opt{gui}) && !(!@ARGV || $opt{no_gui}) && !$opt{save} && eval "r
$gui->MainLoop; $gui->MainLoop;
exit; exit;
} }
die $@ if $@ && $opt{gui}; die $@ if $@ && $opt{gui} && !$opt{no_gui};
if (@ARGV) { # slicing from command line if (@ARGV) { # slicing from command line
# apply command line config on top of default config # apply command line config on top of default config