From: Youness Alaoui <kakaroto@kakaroto.homelinux.net>
Date: Sun, 28 Dec 2014 01:32:01 +0000 (-0500)
Subject: Do not try to hide the splash screen twice
X-Git-Tag: 14.09-1.18~5^2~15
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d06acf6eda1ea81fdc2d3919b0e5218f83ae22c5;p=cura.git

Do not try to hide the splash screen twice
It's possible the splashscreen gets destroyed when it gets hidden,
which could cause the crash mentioned in issue #14. We set the splash
to None after we hide it as we don't need to retry hiding it after.
---

diff --git a/Cura/gui/app.py b/Cura/gui/app.py
index 38b7f8ad..996ab670 100644
--- a/Cura/gui/app.py
+++ b/Cura/gui/app.py
@@ -130,6 +130,7 @@ class CuraApp(wx.App):
 			self.loadFiles = [exampleFile]
 			if self.splash is not None:
 				self.splash.Show(False)
+				self.splash = None
 			configWizard.configWizard()
 
 		if profile.getPreference('check_for_updates') == 'True':
@@ -137,6 +138,7 @@ class CuraApp(wx.App):
 			if newVersion is not None:
 				if self.splash is not None:
 					self.splash.Show(False)
+					self.splash = None
 				if wx.MessageBox(_("A new version of Cura is available, would you like to download?"), _("New version available"), wx.YES_NO | wx.ICON_INFORMATION) == wx.YES:
 					webbrowser.open(newVersion)
 					return
@@ -145,6 +147,7 @@ class CuraApp(wx.App):
 		self.mainWindow = mainWindow.mainWindow()
 		if self.splash is not None:
 			self.splash.Show(False)
+			self.splash = None
 		self.SetTopWindow(self.mainWindow)
 		self.mainWindow.Show()
 		self.mainWindow.OnDropFiles(self.loadFiles)