Increment version number

[cura.git] / Cura / cura.py

diff --git a/Cura/cura.py b/Cura/cura.py
index 765580685fb3b60ff432c30bf2ece8822a0ea872..c6d4e80b0d2cda886f8eb93fd7f7c1a3f35c8bb1 100644 (file)
--- a/Cura/cura.py
+++ b/Cura/cura.py
@@ -19,8 +19,6 @@ def main():
        parser = OptionParser(usage="usage: %prog [options] <filename>.stl")
        parser.add_option("-i", "--ini", action="store", type="string", dest="profileini",
                help="Load settings from a profile ini file")
-       parser.add_option("-r", "--print", action="store", type="string", dest="printfile",
-               help="Open the printing interface, instead of the normal cura interface.")
        parser.add_option("-p", "--profile", action="store", type="string", dest="profile",
                help="Internal option, do not use!")
        parser.add_option("-s", "--slice", action="store_true", dest="slice",
@@ -48,10 +46,7 @@ def main():
        else:
                profile.loadProfile(profile.getDefaultProfilePath(), True)
 
-       if options.printfile is not None:
-               from Cura.gui import printWindow
-               printWindow.startPrintInterface(options.printfile)
-       elif options.slice is not None:
+       if options.slice is not None:
                from Cura.util import sliceEngine
                from Cura.util import objectScene
                from Cura.util import meshLoader
@@ -86,4 +81,15 @@ def main():
                app.CuraApp(args).MainLoop()
 
 if __name__ == '__main__':
+       import os
+       import sys
+
+       # On Windows, the PATH variable can cause the search path for dlls
+       # to give priority to dlls from other applications and it will cause
+       # the bundled python dlls not to be loaded.
+       # More specifically, anyone with Haskell Platform installed will not
+       # be able to launch Cura because glut32.dll from Haskell is incompatible
+       # with the bundled py-opengl and will cause Cura to crash
+       if sys.platform.startswith('win'):
+               os.environ['PATH'] = ''
        main()