|
 |
97023eb |
From 36eff4ab1f33da4774d2a97403674b7500fbae5c Mon Sep 17 00:00:00 2001
|
|
|
97023eb |
From: Guillaume Seguin <guillaume@segu.in>
|
|
|
97023eb |
Date: Sat, 8 Mar 2014 10:04:48 +0100
|
|
|
97023eb |
Subject: [PATCH] Move back code which was incorrectly moved to pronsole
|
|
|
97023eb |
|
|
|
97023eb |
---
|
|
|
97023eb |
printrun/pronsole.py | 2 --
|
|
|
97023eb |
printrun/pronterface.py | 1 +
|
|
|
97023eb |
2 files changed, 1 insertion(+), 2 deletions(-)
|
|
|
97023eb |
|
|
|
97023eb |
diff --git a/printrun/pronsole.py b/printrun/pronsole.py
|
|
|
97023eb |
index d034b62..dec1ba8 100644
|
|
|
97023eb |
--- a/printrun/pronsole.py
|
|
|
97023eb |
+++ b/printrun/pronsole.py
|
|
|
97023eb |
@@ -1154,8 +1154,6 @@ def endcb(self):
|
|
|
97023eb |
print _("Print ended at: %(end_time)s and took %(duration)s") % {"end_time": format_time(time.time()),
|
|
|
97023eb |
"duration": format_duration(print_duration)}
|
|
|
97023eb |
|
|
|
97023eb |
- self.p.runSmallScript(self.endScript)
|
|
|
97023eb |
-
|
|
|
97023eb |
if not self.settings.final_command:
|
|
|
97023eb |
return
|
|
|
97023eb |
run_command(self.settings.final_command,
|
|
|
97023eb |
diff --git a/printrun/pronterface.py b/printrun/pronterface.py
|
|
|
97023eb |
index 9d2a4fa..c469cc3 100644
|
|
|
97023eb |
--- a/printrun/pronterface.py
|
|
|
97023eb |
+++ b/printrun/pronterface.py
|
|
|
97023eb |
@@ -304,6 +304,7 @@ def startcb(self, resuming = False):
|
|
|
97023eb |
def endcb(self):
|
|
|
97023eb |
pronsole.pronsole.endcb(self)
|
|
|
97023eb |
if self.p.queueindex == 0:
|
|
|
97023eb |
+ self.p.runSmallScript(self.endScript)
|
|
|
97023eb |
wx.CallAfter(self.pausebtn.Disable)
|
|
|
97023eb |
wx.CallAfter(self.printbtn.SetLabel, _("Print"))
|
|
|
97023eb |
|
|
|
97023eb |
--
|
|
|
97023eb |
1.8.5.5
|
|
|
97023eb |
|