DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-13 05:48:35 +00:00
Code Issues Releases Wiki Activity

Added startup exception handling

Browse Source
This commit is contained in:
Robert Beekman 2016-01-19 17:10:06 +01:00
parent 65888d1725
commit e8c6951e89
6 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Artemis/Artemis/App.config
View File

@ -204,7 +204,7 @@
<value>TypeWave</value> <value>TypeWave</value>
</setting> </setting>
<setting name="LastKeyboard" serializeAs="String"> <setting name="LastKeyboard" serializeAs="String">
<value>Razer BlackWidow Chroma</value> <value>Logitech G910 Orion Spark</value>
</setting> </setting>
<setting name="EnablePointersUpdate" serializeAs="String"> <setting name="EnablePointersUpdate" serializeAs="String">
<value>True</value> <value>True</value>

15
Artemis/Artemis/AppBootStrapper.cs
View File

@ -1,6 +1,8 @@
using System.Windows; using System;
using System.Windows;
using Artemis.ViewModels; using Artemis.ViewModels;
using Caliburn.Micro; using Caliburn.Micro;
using MessageBox = System.Windows.Forms.MessageBox;
namespace Artemis namespace Artemis
{ {
@ -13,7 +15,16 @@ namespace Artemis
protected override void OnStartup(object sender, StartupEventArgs e) protected override void OnStartup(object sender, StartupEventArgs e)
{ {
DisplayRootViewFor<ShellViewModel>(); try
{
DisplayRootViewFor<ShellViewModel>();
}
catch (Exception ex)
{
MessageBox.Show("Startup failed :c \n" + ex.InnerException.Message);
throw;
}
} }
} }
} }

3
Artemis/Artemis/KeyboardProviders/Logitech/Orion.cs
View File

@ -1,4 +1,5 @@
using System.Drawing; using System;
using System.Drawing;
using System.Threading; using System.Threading;
using Artemis.KeyboardProviders.Logitech.Utilities; using Artemis.KeyboardProviders.Logitech.Utilities;

2
Artemis/Artemis/Settings/General.Designer.cs generated
View File

@ -37,7 +37,7 @@ namespace Artemis.Settings {
[global::System.Configuration.UserScopedSettingAttribute()] [global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("Razer BlackWidow Chroma")] [global::System.Configuration.DefaultSettingValueAttribute("Logitech G910 Orion Spark")]
public string LastKeyboard { public string LastKeyboard {
get { get {
return ((string)(this["LastKeyboard"])); return ((string)(this["LastKeyboard"]));

2
Artemis/Artemis/Settings/General.settings
View File

@ -6,7 +6,7 @@
<Value Profile="(Default)">TypeWave</Value> <Value Profile="(Default)">TypeWave</Value>
</Setting> </Setting>
<Setting Name="LastKeyboard" Type="System.String" Scope="User"> <Setting Name="LastKeyboard" Type="System.String" Scope="User">
<Value Profile="(Default)">Razer BlackWidow Chroma</Value> <Value Profile="(Default)">Logitech G910 Orion Spark</Value>
</Setting> </Setting>
<Setting Name="EnablePointersUpdate" Type="System.Boolean" Scope="User"> <Setting Name="EnablePointersUpdate" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">True</Value> <Value Profile="(Default)">True</Value>

3
Artemis/Artemis/Utilities/GameState/GameStateWebServer.cs
View File

@ -31,8 +31,7 @@ namespace Artemis.Utilities.GameState
return; return;
_listener.Prefixes.Clear(); _listener.Prefixes.Clear();
//Port = FreeTcpPort(); Port = FreeTcpPort();
Port = 5821;
_listener.Prefixes.Add($"http://127.0.0.1:{Port}/"); _listener.Prefixes.Add($"http://127.0.0.1:{Port}/");
_listener.Start(); _listener.Start();