diff --git a/Artemis/Artemis/Artemis.csproj b/Artemis/Artemis/Artemis.csproj
index 86e374573..2b94b673b 100644
--- a/Artemis/Artemis/Artemis.csproj
+++ b/Artemis/Artemis/Artemis.csproj
@@ -188,7 +188,7 @@
True
- ..\packages\squirrel.windows.1.5.1\lib\Net45\ICSharpCode.SharpZipLib.dll
+ ..\packages\squirrel.windows.1.4.4\lib\Net45\ICSharpCode.SharpZipLib.dll
True
@@ -244,7 +244,7 @@
True
- ..\packages\squirrel.windows.1.5.1\lib\Net45\NuGet.Squirrel.dll
+ ..\packages\squirrel.windows.1.4.4\lib\Net45\NuGet.Squirrel.dll
True
@@ -271,8 +271,8 @@
..\packages\SpotifyAPI-NET.2.12.0\lib\SpotifyAPI.dll
True
-
- ..\packages\squirrel.windows.1.5.1\lib\Net45\Squirrel.dll
+
+ ..\packages\squirrel.windows.1.4.4\lib\Net45\Squirrel.dll
True
diff --git a/Artemis/Artemis/Modules/Games/TheDivision/TheDivisionModel.cs b/Artemis/Artemis/Modules/Games/TheDivision/TheDivisionModel.cs
index 613ee5d12..d2a80a83d 100644
--- a/Artemis/Artemis/Modules/Games/TheDivision/TheDivisionModel.cs
+++ b/Artemis/Artemis/Modules/Games/TheDivision/TheDivisionModel.cs
@@ -64,12 +64,15 @@ namespace Artemis.Modules.Games.TheDivision
// Convert the given string to a list of ints
var stringParts = reply.Split(' ');
+ if (stringParts[0] != "1")
+ return;
+
+ // Parse into a list of ints and interpertrate
var parts = new int[stringParts.Length];
for (var i = 0; i < stringParts.Length; i++)
parts[i] = int.Parse(stringParts[i]);
- if (parts[0] == 1)
- InterpertrateDivisionKey(parts);
+ InterpertrateDivisionKey(parts);
}
// Parses Division key data to game data
diff --git a/Artemis/Artemis/Profiles/Layers/Types/Audio/AudioCapturing/AudioCapture.cs b/Artemis/Artemis/Profiles/Layers/Types/Audio/AudioCapturing/AudioCapture.cs
index 8ad1700de..147deb123 100644
--- a/Artemis/Artemis/Profiles/Layers/Types/Audio/AudioCapturing/AudioCapture.cs
+++ b/Artemis/Artemis/Profiles/Layers/Types/Audio/AudioCapturing/AudioCapture.cs
@@ -24,6 +24,7 @@ namespace Artemis.Profiles.Layers.Types.Audio.AudioCapturing
private BasicSpectrumProvider _spectrumProvider;
private GainSource _volume;
private int _volumeIndex;
+ private bool _starting;
public AudioCapture(ILogger logger, MMDevice device, MmDeviceType type)
{
@@ -134,7 +135,11 @@ namespace Artemis.Profiles.Layers.Types.Audio.AudioCapturing
private void Start()
{
+ if (_starting)
+ return;
+
Logger.Debug("Starting audio capture for device: {0}", Device?.FriendlyName ?? "default");
+ _starting = true;
try
{
@@ -190,6 +195,7 @@ namespace Artemis.Profiles.Layers.Types.Audio.AudioCapturing
{
Logger.Warn(e, "Failed to start WASAPI audio capture");
}
+ _starting = false;
}
private void Stop()
@@ -211,6 +217,8 @@ namespace Artemis.Profiles.Layers.Types.Audio.AudioCapturing
_disableTimer.Stop();
_volumeTimer.Stop();
+
+ _mayStop = false;
}
}
}
\ No newline at end of file
diff --git a/Artemis/Artemis/Resources/Keyboards/default-profiles.zip b/Artemis/Artemis/Resources/Keyboards/default-profiles.zip
index 9520a5698..6e056031f 100644
Binary files a/Artemis/Artemis/Resources/Keyboards/default-profiles.zip and b/Artemis/Artemis/Resources/Keyboards/default-profiles.zip differ
diff --git a/Artemis/Artemis/packages.config b/Artemis/Artemis/packages.config
index 79e935f3c..ba55a4840 100644
--- a/Artemis/Artemis/packages.config
+++ b/Artemis/Artemis/packages.config
@@ -29,6 +29,6 @@
-
+
\ No newline at end of file