From 956b6ad33d3fb38daac81f0c6df65ef714c53cea Mon Sep 17 00:00:00 2001 From: Ferdi van der Werf Date: Mon, 9 Apr 2012 01:26:37 +0200 Subject: [PATCH 1/2] Probably fixes #17 issue On OSX spp.Destroy() causes an segfault, sizer.Remove(app) removes app from the form but tries to call spp.Destroy() afterwards. By hiding and detaching I created a workaround for the OSX problem. This solution needs testing on Windows and Linux. --- Cura/gui/mainWindow.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py index 05170c8541..8275272eec 100644 --- a/Cura/gui/mainWindow.py +++ b/Cura/gui/mainWindow.py @@ -302,10 +302,10 @@ class mainWindow(configBase.configWindowBase): newSize = self.GetSize(); newSize.IncBy(0, -spp.GetSize().GetHeight()) self.SetSize(newSize) - self.sizer.Remove(spp) - spp.Destroy() + spp.Show(False) + self.sizer.Detach(spp) for spp in self.progressPanelList: - self.sizer.Remove(spp) + self.sizer.Detach(spp) i = 2 for spp in self.progressPanelList: self.sizer.Add(spp, (i,0), span=(1,4), flag=wx.EXPAND) From 1bbf1365474e52a48c1faf98c44f9e2121e85f96 Mon Sep 17 00:00:00 2001 From: Ferdi van der Werf Date: Mon, 9 Apr 2012 01:28:30 +0200 Subject: [PATCH 2/2] Updated .gitignore Added more ignores, Cura preferences are not needed in repo. --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index aca6813f0e..9b967ebc85 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,6 @@ linux-Cura-* Printrun .idea .DS_Store +Cura/current_profile.ini +Cura/preferences.ini +cura.sh