Commit ea72af56 authored by Denis B's avatar Denis B Committed by Kliment Yanev

Fixed hang on the second launch of skeinforge settings dialog under Windows.

parent ca6bf893
#!/usr/bin/env python #!/usr/bin/env python
import cmd, printcore, sys import cmd, printcore, sys
import glob, os, time import glob, os, time
import sys, subprocess
if os.name=="nt": if os.name=="nt":
try: try:
import _winreg import _winreg
...@@ -1038,7 +1039,9 @@ class pronsole(cmd.Cmd): ...@@ -1038,7 +1039,9 @@ class pronsole(cmd.Cmd):
from skeinforge.skeinforge_application.skeinforge_utilities import skeinforge_craft from skeinforge.skeinforge_application.skeinforge_utilities import skeinforge_craft
from skeinforge.skeinforge_application import skeinforge from skeinforge.skeinforge_application import skeinforge
if(settings): if(settings):
skeinforge.main() param = "skeinforge/skeinforge_application/skeinforge.py"
print "Entering skeinforge settings: ",sys.executable," ",param
subprocess.call([sys.executable,param])
else: else:
if(len(l)>1): if(len(l)>1):
if(l[1] == "view"): if(l[1] == "view"):
...@@ -1049,8 +1052,8 @@ class pronsole(cmd.Cmd): ...@@ -1049,8 +1052,8 @@ class pronsole(cmd.Cmd):
skeinforge_craft.writeOutput(l[0],False) skeinforge_craft.writeOutput(l[0],False)
print "Loading skeined file." print "Loading skeined file."
self.do_load(l[0].replace(".stl","_export.gcode")) self.do_load(l[0].replace(".stl","_export.gcode"))
except: except Exception,e:
print "Skeinforge execution failed." print "Skeinforge execution failed: ",e
def complete_skein(self, text, line, begidx, endidx): def complete_skein(self, text, line, begidx, endidx):
s=line.split() s=line.split()
......
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