From 68f97a708d58d16ebeb60a8c4c290ddec5cf8115 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.noreply.github.com>
Date: Mon, 12 Nov 2018 18:12:00 -0500
Subject: [PATCH] fix more mess in cdl file management

---
 BizHawk.Client.EmuHawk/tools/CDL.cs         | 9 ++++++++-
 BizHawk.Client.EmuHawk/tools/ToolManager.cs | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/tools/CDL.cs b/BizHawk.Client.EmuHawk/tools/CDL.cs
index 927bef2a6c..70051c0f2d 100644
--- a/BizHawk.Client.EmuHawk/tools/CDL.cs
+++ b/BizHawk.Client.EmuHawk/tools/CDL.cs
@@ -203,8 +203,15 @@ namespace BizHawk.Client.EmuHawk
 			if (string.IsNullOrWhiteSpace(_currentFilename))
 			{
 				if (RunSaveAs())
+				{
+					ShutdownCDL();
 					return true;
-				else return false;
+				}
+				else
+				{
+					ShutdownCDL();
+					return false;
+				}
 			}
 			else
 			{
diff --git a/BizHawk.Client.EmuHawk/tools/ToolManager.cs b/BizHawk.Client.EmuHawk/tools/ToolManager.cs
index 681ce8ec49..05d530176d 100644
--- a/BizHawk.Client.EmuHawk/tools/ToolManager.cs
+++ b/BizHawk.Client.EmuHawk/tools/ToolManager.cs
@@ -991,7 +991,7 @@ namespace BizHawk.Client.EmuHawk
 		public void LoadGameGenieEc()
 		{
 			if (GlobalWin.Tools.IsAvailable<GameShark>())
-			{                
+			{
 				GlobalWin.Tools.Load<GameShark>();
 			}
 		}