From 35fc1decfa6cdd73f2b7ad711bfe5cb24b719c9a Mon Sep 17 00:00:00 2001
From: Alessandro Ranellucci <aar@cpan.org>
Date: Thu, 30 Mar 2017 08:15:26 +0200
Subject: [PATCH] Fixed regression causing no_controller not to hide the
 USB/Serial configuration options in Printer config. Fixes #3819

---
 lib/Slic3r/GUI.pm              | 5 +----
 lib/Slic3r/GUI/MainFrame.pm    | 5 +----
 lib/Slic3r/GUI/PresetEditor.pm | 4 +---
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/lib/Slic3r/GUI.pm b/lib/Slic3r/GUI.pm
index eb5a7bd01..d90c56c34 100644
--- a/lib/Slic3r/GUI.pm
+++ b/lib/Slic3r/GUI.pm
@@ -148,10 +148,7 @@ sub OnInit {
     
     # application frame
     Wx::Image::AddHandler(Wx::PNGHandler->new);
-    $self->{mainframe} = my $frame = Slic3r::GUI::MainFrame->new(
-        # If set, the "Controller" tab for the control of the printer over serial line and the serial port settings are hidden.
-        no_controller   => $no_controller // $Settings->{_}{no_controller},
-    );
+    $self->{mainframe} = my $frame = Slic3r::GUI::MainFrame->new;
     $self->SetTopWindow($frame);
     
     # load init bundle
diff --git a/lib/Slic3r/GUI/MainFrame.pm b/lib/Slic3r/GUI/MainFrame.pm
index b1de58b8b..c4ceb7780 100644
--- a/lib/Slic3r/GUI/MainFrame.pm
+++ b/lib/Slic3r/GUI/MainFrame.pm
@@ -18,7 +18,7 @@ our $qs_last_output_file;
 our $last_config;
 
 sub new {
-    my ($class, %params) = @_;
+    my ($class) = @_;
     
     my $self = $class->SUPER::new(undef, -1, 'Slic3r', wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE);
     if ($^O eq 'MSWin32') {
@@ -27,9 +27,6 @@ sub new {
         $self->SetIcon(Wx::Icon->new($Slic3r::var->("Slic3r_128px.png"), wxBITMAP_TYPE_PNG));        
     }
     
-    # store input params
-    # If set, the "Controller" tab for the control of the printer over serial line and the serial port settings are hidden.
-    $self->{no_controller} = $params{no_controller};
     $self->{loaded} = 0;
     
     # initialize tabpanel and menubar
diff --git a/lib/Slic3r/GUI/PresetEditor.pm b/lib/Slic3r/GUI/PresetEditor.pm
index c4c722f10..84b0f1a8e 100644
--- a/lib/Slic3r/GUI/PresetEditor.pm
+++ b/lib/Slic3r/GUI/PresetEditor.pm
@@ -1184,7 +1184,6 @@ sub overridable_options {
 
 sub build {
     my $self = shift;
-    my (%params) = @_;
     
     $self->{extruders_count} = 1;
     
@@ -1231,8 +1230,7 @@ sub build {
                 }
             });
         }
-        if (!$params{no_controller})
-        {
+        unless ($Slic3r::GUI::Settings->{_}{no_controller}) {
             my $optgroup = $page->new_optgroup('USB/Serial connection');
             my $line = Slic3r::GUI::OptionsGroup::Line->new(
                 label => 'Serial port',