Fix the expert window on MacOS. Remove the exception if the GCode loader is interrupt...

diff --git a/Cura/gui/expertConfig.py b/Cura/gui/expertConfig.py
index 624be95413ab1eee72f629aa1fdd0e73e12be34a..e82ae710b77575548d4a49e1c63244f40cbd63ef 100644 (file)
--- a/Cura/gui/expertConfig.py
+++ b/Cura/gui/expertConfig.py
@@ -22,11 +22,11 @@ class expertConfigWindow(wx.Dialog):
                                if s.checkConditions():
                                        configBase.SettingRow(p, s.getName())
 
-       def __init__(self):
+       def __init__(self, callback):
                super(expertConfigWindow, self).__init__(None, title='Expert config', style=wx.DEFAULT_DIALOG_STYLE)
 
                wx.EVT_CLOSE(self, self.OnClose)
-               self.panel = configBase.configPanelBase(self)
+               self.panel = configBase.configPanelBase(self, callback)
 
                left, right, main = self.panel.CreateConfigPanel(self)
                self._addSettingsToPanels('expert', left, right)

diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py
index d6005c3cd76ec984905b0b960cfcfef76a1e1b8a..8a35c2f776272cd07de2d6a598cafc463607d6db 100644 (file)
--- a/Cura/gui/mainWindow.py
+++ b/Cura/gui/mainWindow.py
@@ -388,10 +388,9 @@ class mainWindow(wx.Frame):
                configWizard.headOffsetWizard()
 
        def OnExpertOpen(self, e):
-               ecw = expertConfig.expertConfigWindow()
+               ecw = expertConfig.expertConfigWindow(lambda : self.scene.sceneUpdated())
                ecw.Centre()
-               ecw.ShowModal()
-               self.scene.sceneUpdated()
+               ecw.Show()
 
        def OnMinecraftImport(self, e):
                mi = minecraftImport.minecraftImportWindow(self)

diff --git a/Cura/gui/sceneView.py b/Cura/gui/sceneView.py
index b060e7c0a891ebe6bbf34ced64802ebee0e14dd2..f69657438a3844142e4a23df1be80afee9cd677a 100644 (file)
--- a/Cura/gui/sceneView.py
+++ b/Cura/gui/sceneView.py
@@ -443,6 +443,8 @@ class SceneView(openglGui.glGuiPanel):
                        return True
                if len(self._gcode.layerList) % 5 == 0:
                        time.sleep(0.1)
+               if self._gcode is None:
+                       return True
                if self.layerSelect.getValue() == self.layerSelect.getMaxValue():
                        self.layerSelect.setRange(1, len(self._gcode.layerList) - 1)
                        self.layerSelect.setValue(self.layerSelect.getMaxValue())