Merged with development

This commit is contained in:
SpoinkyNL committed 2016-04-25 17:52:32 +02:00
commit 1643efcc3f
2 files changed
+8 -7

No files matched your search

+3 -2
View File
@@ -1,5 +1,6 @@
using System.Diagnostics;
using System.Linq;
using System.Reflection;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Forms;
@@ -79,8 +80,8 @@ namespace Artemis
private void CheckDuplicateInstances()
{
var processes = Process.GetProcesses();
if (processes.Count(p => p.ProcessName == "Artemis") < 2)
if (Process.GetProcesses().Count(p => p.ProcessName.Contains(Assembly.GetExecutingAssembly()
.FullName.Split(',')[0]) && !p.Modules[0].FileName.Contains("vshost")) < 2)
return;
MessageBox.Show("An instance of Artemis is already running (check your system tray).",
+5 -5
View File
@@ -2,17 +2,17 @@
[
{
"Game":"RocketLeague",
"GameVersion":"1.15",
"GameVersion":"1.16",
"GameAddresses":[
{
"Description":"Boost",
"BasePointer":{
"value":22555396
"value":22411984
},
"Offsets":[
180,
260,
800,
1632,
64,
1636,
1800,
540
]