From c227b5a314dbb3ada6c2efee9ab31125dd3ffbc7 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Tue, 5 Dec 2017 18:05:18 -0800 Subject: [PATCH] Set CurrentDirectory before incurring AggContext spin up - Fixes inability to set AggContext DialogProvider via config file due to not yet set CurrentDirectory --- .../MatterControl/MatterControlUtilities.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs index 27f5ca5d9..f5e43dfdb 100644 --- a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs +++ b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs @@ -480,16 +480,16 @@ namespace MatterHackers.MatterControl.Tests.Automation staticDataPathOverride = TestContext.CurrentContext.ResolveProjectPath(5, "MatterControl", "StaticData"); } - // Override the default SystemWindow type without config.json - AggContext.Config.ProviderTypes.SystemWindow = "MatterHackers.Agg.UI.OpenGLSystemWindow, agg_platform_win32"; - #if DEBUG string outputDirectory = "Debug"; #else string outputDirectory = "Release"; #endif - Environment.CurrentDirectory = TestContext.CurrentContext.ResolveProjectPath(5, "MatterControl", "bin", outputDirectory); + Environment.CurrentDirectory = TestContext.CurrentContext.ResolveProjectPath(5, "MatterControl", "bin", outputDirectory); + + // Override the default SystemWindow type without config.json + AggContext.Config.ProviderTypes.SystemWindow = "MatterHackers.Agg.UI.OpenGLSystemWindow, agg_platform_win32"; #if !__ANDROID__ // Set the static data to point to the directory of MatterControl