From b93bf2a116104e742dc023ebd031d8147e689ebd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xoan=20Sampai=C3=B1o?= <xoansampainho@gmail.com>
Date: Fri, 31 Mar 2017 14:11:08 +0200
Subject: [PATCH] Fix regression from 35fc1de which hides settings from
 PresetEditor but leaves Controller tab always visible

---
 lib/Slic3r/GUI/MainFrame.pm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/Slic3r/GUI/MainFrame.pm b/lib/Slic3r/GUI/MainFrame.pm
index c4ceb77802..e5ae478f9b 100644
--- a/lib/Slic3r/GUI/MainFrame.pm
+++ b/lib/Slic3r/GUI/MainFrame.pm
@@ -99,9 +99,7 @@ sub _init_tabpanel {
     });
     
     $panel->AddPage($self->{plater} = Slic3r::GUI::Plater->new($panel), "Plater");
-    if (!$self->{no_controller}) {
-        $panel->AddPage($self->{controller} = Slic3r::GUI::Controller->new($panel), "Controller");
-    }
+    $panel->AddPage($self->{controller} = Slic3r::GUI::Controller->new($panel), "Controller") unless ($Slic3r::GUI::Settings->{_}{no_controller});
 }
 
 sub _init_menubar {
@@ -259,7 +257,7 @@ sub _init_menubar {
         }, undef, 'application_view_tile.png');
         $self->_append_menu_item($windowMenu, "&Controller\tCtrl+Y", 'Show the printer controller', sub {
             $self->select_tab(1);
-        }, undef, 'printer_empty.png') if !$self->{no_controller};
+        }, undef, 'printer_empty.png') unless ($Slic3r::GUI::Settings->{_}{no_controller});
         $self->_append_menu_item($windowMenu, "DLP Projector…\tCtrl+P", 'Open projector window for DLP printing', sub {
             $self->{plater}->pause_background_process;
             Slic3r::GUI::SLAPrintOptions->new($self)->ShowModal;