Fixed: Exit from tray icon

pull/4/head
Mark McDowall 11 years ago
parent 401a5c9f26
commit 3eeee7335e

@ -17,8 +17,6 @@ namespace NzbDrone.Common.Composition
protected ContainerBuilderBase(IStartupContext args, params string[] assemblies) protected ContainerBuilderBase(IStartupContext args, params string[] assemblies)
{ {
_loadedTypes = new List<Type>(); _loadedTypes = new List<Type>();
foreach (var assembly in assemblies) foreach (var assembly in assemblies)
@ -55,8 +53,6 @@ namespace NzbDrone.Common.Composition
{ {
var implementations = Container.GetImplementations(contractType).Where(c => !c.IsGenericTypeDefinition).ToList(); var implementations = Container.GetImplementations(contractType).Where(c => !c.IsGenericTypeDefinition).ToList();
if (implementations.Count == 0) if (implementations.Count == 0)
{ {
return; return;

@ -139,7 +139,6 @@ namespace NzbDrone.Common
} }
} }
public ServiceControllerStatus GetStatus(string serviceName) public ServiceControllerStatus GetStatus(string serviceName)
{ {
return GetService(serviceName).Status; return GetService(serviceName).Status;

@ -40,7 +40,10 @@ namespace NzbDrone.Host
startCallback(_container); startCallback(_container);
} }
SpinToExit(appMode); else
{
SpinToExit(appMode);
}
} }
catch (TerminateApplicationException e) catch (TerminateApplicationException e)
{ {

@ -23,7 +23,6 @@ namespace NzbDrone.SysTray
_browserService = browserService; _browserService = browserService;
} }
public void Start() public void Start()
{ {
Application.ThreadException += OnThreadException; Application.ThreadException += OnThreadException;

@ -34,7 +34,5 @@ namespace NzbDrone
MessageBox.Show(text: message, buttons: MessageBoxButtons.OK, icon: MessageBoxIcon.Error, caption: "Epic Fail!"); MessageBox.Show(text: message, buttons: MessageBoxButtons.OK, icon: MessageBoxIcon.Error, caption: "Epic Fail!");
} }
} }
} }
} }

Loading…
Cancel
Save