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

Fixed profile null reference

Browse Source
This commit is contained in:
SpoinkyNL 2016-06-02 10:58:49 +02:00
parent 2c748ca5d1
commit 76cfc09fa4
8 changed files with 48 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Artemis/Artemis/DeviceProviders/Logitech/Orion.cs
View File

@ -4,6 +4,7 @@ using System.Windows;
using Artemis.DeviceProviders.Logitech.Utilities;
using Artemis.Properties;
using Artemis.Utilities;
using Artemis.Utilities.LogitechDll;
namespace Artemis.DeviceProviders.Logitech
{
@ -21,10 +22,11 @@ namespace Artemis.DeviceProviders.Logitech
PreviewSettings = new PreviewSettings(540, 154, new Thickness(25, -80, 0, 0), Resources.g910);
}
// TODO: https://github.com/SpoinkyNL/Artemis/issues/86
public override bool CanEnable()
{
//if (DllManager.RestoreDll())
// RestoreDll();
if (DllManager.RestoreDll())
RestoreDll();
int majorNum = 0, minorNum = 0, buildNum = 0;
LogitechGSDK.LogiLedInit();

6
Artemis/Artemis/Modules/Games/CounterStrike/CounterStrikeModel.cs
View File

@ -55,11 +55,17 @@ namespace Artemis.Modules.Games.CounterStrike
public override Brush GenerateMouseBrush()
{
if (Profile == null || GameDataModel == null)
return null;
return Profile.GenerateBrush<CounterStrikeDataModel>(GameDataModel, LayerType.Mouse, false, true);
}
public override Brush GenerateHeadsetBrush()
{
if (Profile == null || GameDataModel == null)
return null;
return Profile.GenerateBrush<CounterStrikeDataModel>(GameDataModel, LayerType.Headset, false, true);
}

1
Artemis/Artemis/Modules/Games/Dota2/Dota2DataModel.cs
View File

@ -23,6 +23,7 @@ namespace Artemis.Modules.Games.Dota2
public class Map
{
public int dayCyclePercentage;
public string name { get; set; }
public long matchid { get; set; }
public int game_time { get; set; }

20
Artemis/Artemis/Modules/Games/Dota2/Dota2Model.cs
View File

@ -23,7 +23,6 @@ namespace Artemis.Modules.Games.Dota2
public int Scale { get; set; }
public new Dota2Settings Settings { get; set; }
public Dota2DataModel D2Json { get; set; }
public override void Dispose()
{
@ -41,20 +40,17 @@ namespace Artemis.Modules.Games.Dota2
public override void Update()
{
if (D2Json?.map == null)
return;
UpdateDay();
}
private void UpdateDay()
{
if (D2Json?.map?.daytime == null)
var dataModel = GameDataModel as Dota2DataModel;
if (dataModel?.map?.daytime == null)
return;
var timeLeft = 240 - D2Json.map.clock_time%240;
var timePercentage = 100.00/240*timeLeft;
// TODO: Insert timePercentage into the DataModel as it will be useful when creating profiles
var timeLeft = 240 - dataModel.map.clock_time%240;
dataModel.map.dayCyclePercentage = (int) (100.00 / 240 * timeLeft);
}
@ -69,11 +65,17 @@ namespace Artemis.Modules.Games.Dota2
public override Brush GenerateMouseBrush()
{
if (Profile == null || GameDataModel == null)
return null;
return Profile.GenerateBrush<Dota2DataModel>(GameDataModel, LayerType.Mouse, false, true);
}
public override Brush GenerateHeadsetBrush()
{
if (Profile == null || GameDataModel == null)
return null;
return Profile.GenerateBrush<Dota2DataModel>(GameDataModel, LayerType.Headset, false, true);
}
@ -86,7 +88,7 @@ namespace Artemis.Modules.Games.Dota2
return;
// Parse the JSON
D2Json = JsonConvert.DeserializeObject<Dota2DataModel>(jsonString);
GameDataModel = JsonConvert.DeserializeObject<Dota2DataModel>(jsonString);
}
}
}

10
Artemis/Artemis/Modules/Games/Overwatch/OverwatchModel.cs
View File

@ -139,12 +139,18 @@ namespace Artemis.Modules.Games.Overwatch
public override Brush GenerateMouseBrush()
{
return Profile?.GenerateBrush<OverwatchDataModel>(GameDataModel, LayerType.Mouse, false, true);
if (Profile == null || GameDataModel == null)
return null;
return Profile.GenerateBrush<OverwatchDataModel>(GameDataModel, LayerType.Mouse, false, true);
}
public override Brush GenerateHeadsetBrush()
{
return Profile?.GenerateBrush<OverwatchDataModel>(GameDataModel, LayerType.Headset, false, true);
if (Profile == null || GameDataModel == null)
return null;
return Profile.GenerateBrush<OverwatchDataModel>(GameDataModel, LayerType.Headset, false, true);
}
}

6
Artemis/Artemis/Modules/Games/RocketLeague/RocketLeagueModel.cs
View File

@ -80,11 +80,17 @@ namespace Artemis.Modules.Games.RocketLeague
public override Brush GenerateMouseBrush()
{
if (Profile == null || GameDataModel == null)
return null;
return Profile.GenerateBrush<RocketLeagueDataModel>(GameDataModel, LayerType.Mouse, false, true);
}
public override Brush GenerateHeadsetBrush()
{
if (Profile == null || GameDataModel == null)
return null;
return Profile.GenerateBrush<RocketLeagueDataModel>(GameDataModel, LayerType.Headset, false, true);
}
}

6
Artemis/Artemis/Modules/Games/TheDivision/TheDivisionModel.cs
View File

@ -244,11 +244,17 @@ namespace Artemis.Modules.Games.TheDivision
public override Brush GenerateMouseBrush()
{
if (Profile == null || GameDataModel == null)
return null;
return Profile.GenerateBrush<TheDivisionDataModel>(GameDataModel, LayerType.Mouse, false, true);
}
public override Brush GenerateHeadsetBrush()
{
if (Profile == null || GameDataModel == null)
return null;
return Profile.GenerateBrush<TheDivisionDataModel>(GameDataModel, LayerType.Headset, false, true);
}
}

6
Artemis/Artemis/Modules/Games/Witcher3/Witcher3Model.cs
View File

@ -117,11 +117,17 @@ namespace Artemis.Modules.Games.Witcher3
public override Brush GenerateMouseBrush()
{
if (Profile == null || GameDataModel == null)
return null;
return Profile.GenerateBrush<Witcher3DataModel>(GameDataModel, LayerType.Mouse, false, true);
}
public override Brush GenerateHeadsetBrush()
{
if (Profile == null || GameDataModel == null)
return null;
return Profile.GenerateBrush<Witcher3DataModel>(GameDataModel, LayerType.Headset, false, true);
}
}