From 9d007d827fe913d2dbd942c14aff6241578b0669 Mon Sep 17 00:00:00 2001
From: Vitaliy Davydiak <vda@sitecore.net>
Date: Thu, 15 Aug 2019 17:13:00 +0300
Subject: [PATCH] Make SaveMapping and SaveMappingToFile settings independent.
 When both are true - mappings are applied instantly and may affect further
 requests recording.

---
 src/WireMock.Net/Server/FluentMockServer.Admin.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/WireMock.Net/Server/FluentMockServer.Admin.cs b/src/WireMock.Net/Server/FluentMockServer.Admin.cs
index e1e6124e0..f5aa830ca 100644
--- a/src/WireMock.Net/Server/FluentMockServer.Admin.cs
+++ b/src/WireMock.Net/Server/FluentMockServer.Admin.cs
@@ -266,10 +266,14 @@ private async Task<ResponseMessage> ProxyAndRecordAsync(RequestMessage requestMe
 
             var responseMessage = await HttpClientHelper.SendAsync(_httpClientForProxy, requestMessage, proxyUriWithRequestPathAndQuery.AbsoluteUri);
 
-            if (settings.ProxyAndRecordSettings.SaveMapping)
+            if (settings.ProxyAndRecordSettings.SaveMapping || settings.ProxyAndRecordSettings.SaveMappingToFile)
             {
                 var mapping = ToMapping(requestMessage, responseMessage, settings.ProxyAndRecordSettings.BlackListedHeaders ?? new string[] { });
-                _options.Mappings.TryAdd(mapping.Guid, mapping);
+
+                if (settings.ProxyAndRecordSettings.SaveMapping)
+                {
+                    _options.Mappings.TryAdd(mapping.Guid, mapping);
+                }
 
                 if (settings.ProxyAndRecordSettings.SaveMappingToFile)
                 {