chiark
/
gitweb
/
~ianmdlvl
/
cura.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2b836b4
)
Fix a bug with loading files on windows, which was happening on a thread causing...
author
daid
<daid303@gmail.com>
Mon, 8 Dec 2014 08:55:06 +0000
(09:55 +0100)
committer
daid
<daid303@gmail.com>
Mon, 8 Dec 2014 08:55:06 +0000
(09:55 +0100)
Cura/gui/app.py
patch
|
blob
|
history
Cura/gui/mainWindow.py
patch
|
blob
|
history
diff --git
a/Cura/gui/app.py
b/Cura/gui/app.py
index 7dff8e9d49ecb4adbc9a843aaa62530fe2911fbf..ce167b26a35fcd37cfde0a8ac517e42765bc501f 100644
(file)
--- a/
Cura/gui/app.py
+++ b/
Cura/gui/app.py
@@
-90,7
+90,7
@@
class CuraApp(wx.App):
sock.bind(("127.0.0.1", port))
while True:
data, addr = sock.recvfrom(2048)
-
self.mainWindow.OnDropFiles(
data.split('\0'))
+
wx.callAfter(self.mainWindow.OnDropFiles,
data.split('\0'))
except:
pass
diff --git
a/Cura/gui/mainWindow.py
b/Cura/gui/mainWindow.py
index 2c49983428776345cdd3f7982f1743820ea62db5..efd81163b49bd2c4b667eaadf4a70aa733111548 100644
(file)
--- a/
Cura/gui/mainWindow.py
+++ b/
Cura/gui/mainWindow.py
@@
-395,8
+395,6
@@
class mainWindow(wx.Frame):
prefDialog.Raise()
def OnDropFiles(self, files):
- if len(files) > 0:
- self.updateProfileToAllControls()
self.scene.loadFiles(files)
def OnModelMRU(self, e):