From 0553a39a02fd78a2926ef1d0e2acf9fc3f9bf25f Mon Sep 17 00:00:00 2001
From: Taloth Saldono <Taloth@users.noreply.github.com>
Date: Wed, 13 Dec 2017 20:25:29 +0100
Subject: [PATCH] Rare timing issue on first-use causing duplicate naming
 config.

---
 src/NzbDrone.Core/Organizer/NamingConfigService.cs | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/NzbDrone.Core/Organizer/NamingConfigService.cs b/src/NzbDrone.Core/Organizer/NamingConfigService.cs
index 1cbe993dc..8cd9d3234 100644
--- a/src/NzbDrone.Core/Organizer/NamingConfigService.cs
+++ b/src/NzbDrone.Core/Organizer/NamingConfigService.cs
@@ -21,8 +21,16 @@ namespace NzbDrone.Core.Organizer
 
             if (config == null)
             {
-                _repository.Insert(NamingConfig.Default);
-                config = _repository.Single();
+                lock (_repository)
+                {
+                    config = _repository.SingleOrDefault();
+
+                    if (config == null)
+                    {
+                        _repository.Insert(NamingConfig.Default);
+                        config = _repository.Single();
+                    }
+                }
             }
 
             return config;
@@ -33,4 +41,4 @@ namespace NzbDrone.Core.Organizer
             _repository.Upsert(namingConfig);
         }
     }
-}
\ No newline at end of file
+}