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

This commit is contained in:
Mark McDowall 2011-05-27 17:24:08 -07:00
commit 6c7fa1674e
3 changed files with 6 additions and 6 deletions

View File

@ -46,7 +46,7 @@
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<DefineConstants>TRACE;DOTNET2</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>

View File

@ -132,7 +132,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Ninject.2.2.1.0\lib\.NetFramework 4.0\Ninject.dll</HintPath>
</Reference>
<Reference Include="NLog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL" />
<Reference Include="NLog">
<HintPath>Libraries\NLog.dll</HintPath>
</Reference>
<Reference Include="SubSonic.Core, Version=3.0.0.3, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>Libraries\SubSonic.Core.dll</HintPath>

View File

@ -31,12 +31,9 @@ namespace NzbDrone
IISController.StopServer();
IISController.StartServer();
#if DEBUG
Attach();
#endif
try
{
Logger.Info("Starting default browser. {0}",IISController.AppUrl);
@ -60,6 +57,7 @@ namespace NzbDrone
Console.ReadLine();
}
#if DEBUG
private static void Attach()
{
if (Debugger.IsAttached)
@ -91,7 +89,7 @@ namespace NzbDrone
}
}
}
#endif
private static void AppDomainException(object excepion)
{