From: Daid <daid303@gmail.com>
Date: Sun, 29 Apr 2012 09:44:07 +0000 (+0200)
Subject: Remove other models when loading a single model again after a dual load.
X-Git-Tag: RC3~13^2~12
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=2e6f8874999f897d72450f0ecaf2901a3c993681;p=cura.git

Remove other models when loading a single model again after a dual load.
---

diff --git a/Cura/gui/preview3d.py b/Cura/gui/preview3d.py
index ac8eff97..ad2f5f0d 100644
--- a/Cura/gui/preview3d.py
+++ b/Cura/gui/preview3d.py
@@ -203,8 +203,9 @@ class previewPanel(wx.Panel):
 	def loadModelFiles(self, filelist):
 		while len(filelist) > len(self.objectList):
 			self.objectList.append(previewObject())
-		for idx in xrange(len(self.objectList), len(filelist)):
+		for idx in xrange(len(filelist), len(self.objectList)):
 			self.objectList[idx].mesh = None
+			self.objectList[idx].filename = None
 		for idx in xrange(0, len(filelist)):
 			obj = self.objectList[idx]
 			if obj.filename != filelist[idx]:
@@ -232,7 +233,7 @@ class previewPanel(wx.Panel):
 	
 	def doFileLoadThread(self):
 		for obj in self.objectList:
-			if os.path.isfile(obj.filename) and obj.fileTime != os.stat(obj.filename).st_mtime:
+			if obj.filename != None and os.path.isfile(obj.filename) and obj.fileTime != os.stat(obj.filename).st_mtime:
 				obj.ileTime = os.stat(obj.filename).st_mtime
 				mesh = stl.stlModel()
 				mesh.load(obj.filename)