Revision 29a6b387 trunk/Pithos.Client.WPF/App.xaml.cs
b/trunk/Pithos.Client.WPF/App.xaml.cs | ||
---|---|---|
12 | 12 |
using Caliburn.Micro; |
13 | 13 |
using Microsoft.Win32; |
14 | 14 |
using Caliburn.Micro.Logging; |
15 |
using Pithos.Client.WPF.Properties; |
|
15 | 16 |
|
16 | 17 |
|
17 | 18 |
namespace Pithos.Client.WPF |
... | ... | |
34 | 35 |
InitializeComponent(); |
35 | 36 |
} |
36 | 37 |
|
38 |
protected override void OnStartup(StartupEventArgs e) |
|
39 |
{ |
|
40 |
if (!Settings.Default.StartOnSystemStartup && e.Args.Contains("startup")) |
|
41 |
{ |
|
42 |
this.Shutdown(); |
|
43 |
} |
|
44 |
base.OnStartup(e); |
|
45 |
} |
|
46 |
|
|
37 | 47 |
private void OnUnobservedException(object sender, UnobservedTaskExceptionEventArgs e) |
38 | 48 |
{ |
39 | 49 |
var messages=new List<UserMessage>(); |
Also available in: Unified diff