Skip to content

P
Printrun
Commit 086620c6 authored by Nathan Zadoks's avatar Nathan Zadoks
Browse files
Options

Fixed SD Upload being enabled without a file being loaded.

parent 04b72b28
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
pronterface.py
View file @ 086620c6
...@@ -72,6 +72,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole): ...@@ -72,6 +72,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
self.statuscheck=False self.statuscheck=False
self.tempreport="" self.tempreport=""
self.monitor=0 self.monitor=0
self.f=None
self.skeinp=None self.skeinp=None
self.monitor_interval=3 self.monitor_interval=3
self.paused=False self.paused=False
...@@ -678,6 +679,8 @@ class PronterWindow(wx.Frame,pronsole.pronsole): ...@@ -678,6 +679,8 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
obj = e.GetEventObject() obj = e.GetEventObject()
popupmenu=wx.Menu() popupmenu=wx.Menu()
item = popupmenu.Append(-1,_("SD Upload")) item = popupmenu.Append(-1,_("SD Upload"))
if not self.f or not len(self.f):
item.Enable(False)
self.Bind(wx.EVT_MENU,self.upload,id=item.GetId()) self.Bind(wx.EVT_MENU,self.upload,id=item.GetId())
item = popupmenu.Append(-1,_("SD Print")) item = popupmenu.Append(-1,_("SD Print"))
self.Bind(wx.EVT_MENU,self.sdprintfile,id=item.GetId()) self.Bind(wx.EVT_MENU,self.sdprintfile,id=item.GetId())
...@@ -1407,7 +1410,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole): ...@@ -1407,7 +1410,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
self.recvlisteners.remove(self.uploadtrigger) self.recvlisteners.remove(self.uploadtrigger)
def upload(self,event): def upload(self,event):
if not len(self.f): if not self.f or not len(self.f):
return return
if not self.p.online: if not self.p.online:
return return
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment