Merge pull request #8557 from juanmpd/patch-1

luipir · web-flow · commit 42e30b652461 · 2018-11-27T15:14:57.000+01:00
Update Grass7Utils.py. Fixes #20632 #20502
diff --git a/python/plugins/processing/algs/grass7/Grass7Utils.py b/python/plugins/processing/algs/grass7/Grass7Utils.py
@@ -400,6 +400,11 @@ def executeGrass(commands, feedback, outputCommands=None):
         # commands again.
         if not grassOutDone and outputCommands:
             command, grassenv = Grass7Utils.prepareGrassExecution(outputCommands)
+            # For MS-Windows, we need to hide the console window.
+            if isWindows():
+                si = subprocess.STARTUPINFO()
+                si.dwFlags |= subprocess.STARTF_USESHOWWINDOW
+                si.wShowWindow = subprocess.SW_HIDE
             with subprocess.Popen(
                     command,
                     shell=False,
@@ -408,6 +413,7 @@ def executeGrass(commands, feedback, outputCommands=None):
                     stderr=subprocess.STDOUT,
                     universal_newlines=True,
                     env=grassenv,
+                    encoding="cp{}".format(Grass7Utils.getWindowsCodePage()) if isWindows() else None,
                     startupinfo=si if isWindows() else None
             ) as proc:
                 for line in iter(proc.stdout.readline, ''):
