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