Skip to content

Commit

Permalink
Fixed favourite device backward compat.
Browse files Browse the repository at this point in the history
Added packaging bat's
  • Loading branch information
xenolightning committed Nov 10, 2014
1 parent 1d16ce4 commit 486aa45
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 1 deletion.
10 changes: 9 additions & 1 deletion FortyOne.AudioSwitcher/AudioSwitcher.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using System.IO;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Text.RegularExpressions;
using System.Threading;
using System.Windows.Forms;
using AudioSwitcher.AudioApi;
Expand Down Expand Up @@ -565,7 +566,14 @@ private void LoadSettings()

var favDeviceStr = ConfigurationSettings.FavouriteDevices.Split(new[] { ",", "[", "]" }, StringSplitOptions.RemoveEmptyEntries);

FavouriteDeviceManager.LoadFavouriteDevices(Array.ConvertAll(favDeviceStr, x => new Guid(x)));
FavouriteDeviceManager.LoadFavouriteDevices(Array.ConvertAll(favDeviceStr, x =>
{
var r = new Regex(ConfigurationSettings.GUID_REGEX);
foreach(var match in r.Matches(x))
return new Guid(match.ToString());

return Guid.Empty;
}));

RegistryKey runKey = Registry.CurrentUser.OpenSubKey("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run", true);
//Ensure the registry key is added/removed
Expand Down
1 change: 1 addition & 0 deletions packaging/compile.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
..\packages\ilmerge.2.13.0307\ilmerge /target:winexe /out:AudioSwitcher.exe ..\FortyOne.AudioSwitcher\bin\Release\AudioSwitcher.exe ..\FortyOne.AudioSwitcher\bin\Release\AudioSwitcher.AudioApi.dll ..\FortyOne.AudioSwitcher\bin\Release\AudioSwitcher.AudioApi.CoreAudio.dll ..\FortyOne.AudioSwitcher\bin\Release\WindowsInput.dll
2 changes: 2 additions & 0 deletions packaging/libz.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
..\packages\LibZ.Bootstrap.1.1.0.2\tools\libz sign-and-fix --include ..\FortyOne.AudioSwitcher\bin\Release\*.dll --include ..\FortyOne.AudioSwitcher\bin\Release\*.exe --key ..\FortyOne.AudioSwitcher\fortyone.snk
..\packages\LibZ.Bootstrap.1.1.0.2\tools\libz inject-dll --assembly=..\FortyOne.AudioSwitcher\bin\Release\AudioSwitcher.exe --include=..\FortyOne.AudioSwitcher\bin\Release\*.dll --key ..\FortyOne.AudioSwitcher\fortyone.snk --move

0 comments on commit 486aa45

Please sign in to comment.