Merge branch 'master' of git://github.com/kayone/NzbDrone

13 years ago · 020283225b
parent f1f85a0eca eaaf464d38
commit 020283225b
2 changed files with 4 additions and 4 deletions
--- a/NzbDrone.Core/CentralDispatch.cs
+++ b/NzbDrone.Core/CentralDispatch.cs
@ -56,10 +56,10 @@ namespace NzbDrone.Core
        {
            BindKernel();

-            LogConfiguration.StartDbLogging();
-
            MigrationsHelper.Run(Connection.MainConnectionString, true);
            
+            LogConfiguration.StartDbLogging();
+
            _kernel.Get<QualityProvider>().SetupDefaultProfiles();

            BindExternalNotifications();
--- a/NzbDrone.Core/Providers/Jobs/JobProvider.cs
+++ b/NzbDrone.Core/Providers/Jobs/JobProvider.cs
@ -191,12 +191,12 @@ namespace NzbDrone.Core.Providers.Jobs
        {
            do
            {
-                Tuple<Type, int> job = null;
-
                using (NestedDiagnosticsContext.Push(Guid.NewGuid().ToString()))
                {
                    try
                    {
+                        Tuple<Type, int> job = null;
+
                        lock (Queue)
                        {
                            if (Queue.Count != 0)