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

NzbDrone.Core.Test/EpisodeProviderTest_GetEpisodesByParseResult.cs

@@ -51,6 +51,7 @@ namespace NzbDrone.Core.Test
             var ep = mocker.Resolve<EpisodeProvider>().GetEpisodesByParseResult(parseResult);
 
             ep.Should().HaveCount(1);
+            parseResult.EpisodeTitle.Should().Be(fakeEpisode.Title);
             ep.First().ShouldHave().AllPropertiesBut(e => e.Series);
         }
 
@@ -138,6 +139,7 @@ namespace NzbDrone.Core.Test
             ep.Should().HaveCount(2);
             db.Fetch<Episode>().Should().HaveCount(2);
             ep.First().ShouldHave().AllPropertiesBut(e => e.Series);
+            parseResult.EpisodeTitle.Should().Be(fakeEpisode.Title);
         }
 
         [Test]

NzbDrone.Core/Datastore/PetaPoco/PetaPoco.cs

@@ -355,16 +355,19 @@ namespace PetaPoco
         // Open a connection (can be nested)
         public void OpenSharedConnection()
         {
-            if (_sharedConnectionDepth == 0)
+            using (MvcMiniProfiler.MiniProfiler.StepStatic("OpenSharedConnection"))
             {
-                _sharedConnection = _factory.CreateConnection();
+                if (_sharedConnectionDepth == 0)
-                _sharedConnection.ConnectionString = _connectionString;
+                {
-                _sharedConnection.Open();
+                    _sharedConnection = _factory.CreateConnection();
+                    _sharedConnection.ConnectionString = _connectionString;
+                    _sharedConnection.Open();
 
-                if (KeepConnectionAlive)
+                    if (KeepConnectionAlive)
-                    _sharedConnectionDepth++;		// Make sure you call Dispose
+                        _sharedConnectionDepth++; // Make sure you call Dispose
+                }
+                _sharedConnectionDepth++;
             }
-            _sharedConnectionDepth++;
         }
 
         /// <summary>

NzbDrone.Core/Providers/EpisodeProvider.cs

@@ -137,6 +137,7 @@ namespace NzbDrone.Core.Providers
                 if (episodeInfo != null)
                 {
                     result.Add(episodeInfo);
+                    parseResult.EpisodeTitle = episodeInfo.Title;
                 }
                 else
                 {

NzbDrone/Program.cs

@@ -34,18 +34,21 @@ namespace NzbDrone
 #if DEBUG
                 Attach();
 #endif
-                try
+                if (Environment.UserInteractive)
                 {
-                    Logger.Info("Starting default browser. {0}",IISController.AppUrl);
+                    try
-                    Process.Start(IISController.AppUrl);
+                    {
-                }
+                        Logger.Info("Starting default browser. {0}", IISController.AppUrl);
-                catch(Exception e)
+                        Process.Start(IISController.AppUrl);
-                {
+                    }
-                    Logger.ErrorException("Failed to open URL in default browser.", e);
+                    catch (Exception e)
-                }
+                    {
-                while (true)
+                        Logger.ErrorException("Failed to open URL in default browser.", e);
-                {
+                    }
-                    Console.ReadLine();
+                    while (true)
+                    {
+                        Console.ReadLine();
+                    }
                 }
             }
             catch (Exception e)