From a5f97fe12cf83d807cc4a011c9a0fd347ee844df Mon Sep 17 00:00:00 2001
From: Lars Brubaker <larsbrubaker@gmail.com>
Date: Wed, 3 Jan 2018 10:46:39 -0800
Subject: [PATCH] Set the default culture

---
 Launcher/Launcher.cs                   | 10 ++++++++++
 PrinterDriverInstaller/InfInstaller.cs | 10 ++++++++++
 Program.cs                             |  4 ++++
 Submodules/MatterSlice                 |  2 +-
 4 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/Launcher/Launcher.cs b/Launcher/Launcher.cs
index 86a10b68e..5622f3c52 100644
--- a/Launcher/Launcher.cs
+++ b/Launcher/Launcher.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Diagnostics;
+using System.Globalization;
 using System.IO;
+using System.Threading;
 
 namespace MatterHackers.MatterControl.Launcher
 {
@@ -13,6 +15,14 @@ namespace MatterHackers.MatterControl.Launcher
 		[STAThread]
 		public static void Main(string[] args)
 		{
+			// this sets the global culture for the app and all new threads
+			CultureInfo.DefaultThreadCurrentCulture = CultureInfo.InvariantCulture;
+			CultureInfo.DefaultThreadCurrentUICulture = CultureInfo.InvariantCulture;
+
+			// and make sure tha appl is set correctly
+			Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
+			Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture;
+
 			if (args.Length == 2 && File.Exists(args[0]))
 			{
 				ProcessStartInfo runAppLauncherStartInfo = new ProcessStartInfo();
diff --git a/PrinterDriverInstaller/InfInstaller.cs b/PrinterDriverInstaller/InfInstaller.cs
index 1921bc5a0..792d40878 100644
--- a/PrinterDriverInstaller/InfInstaller.cs
+++ b/PrinterDriverInstaller/InfInstaller.cs
@@ -1,7 +1,9 @@
 using System;
 using System.Diagnostics;
+using System.Globalization;
 using System.IO;
 using System.Runtime.InteropServices;
+using System.Threading;
 
 namespace MatterHackers.InfInstaller
 {
@@ -63,6 +65,14 @@ namespace MatterHackers.InfInstaller
 		[STAThread]
 		public static void Main(string[] args)
 		{
+			// this sets the global culture for the app and all new threads
+			CultureInfo.DefaultThreadCurrentCulture = CultureInfo.InvariantCulture;
+			CultureInfo.DefaultThreadCurrentUICulture = CultureInfo.InvariantCulture;
+
+			// and make sure tha appl is set correctly
+			Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
+			Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture;
+
 			if (args.Length > 0 && File.Exists(args[0]))
 			{
 				InfInstallerApp driverInstaller = new InfInstallerApp();
diff --git a/Program.cs b/Program.cs
index f5717cb7a..0d9fc01d7 100644
--- a/Program.cs
+++ b/Program.cs
@@ -23,9 +23,13 @@ namespace MatterHackers.MatterControl
 		[STAThread]
 		public static void Main()
 		{
+			// this sets the global culture for the app and all new threads
 			CultureInfo.DefaultThreadCurrentCulture = CultureInfo.InvariantCulture;
+			CultureInfo.DefaultThreadCurrentUICulture = CultureInfo.InvariantCulture;
 
+			// and make sure tha appl is set correctly
 			Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
+			Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture;
 
 			AggContext.Init(embeddedResourceName: "config.json");
 
diff --git a/Submodules/MatterSlice b/Submodules/MatterSlice
index b54ccbb4a..2e8ebc916 160000
--- a/Submodules/MatterSlice
+++ b/Submodules/MatterSlice
@@ -1 +1 @@
-Subproject commit b54ccbb4a83429826c42f791e21f92bf52c88f1e
+Subproject commit 2e8ebc916aa608e145e69a3f44d7c1f2cd6319a3