diff --git a/Artemis/Artemis/Artemis.csproj b/Artemis/Artemis/Artemis.csproj
index bce65305f..558849b91 100644
--- a/Artemis/Artemis/Artemis.csproj
+++ b/Artemis/Artemis/Artemis.csproj
@@ -206,6 +206,10 @@
..\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Rocks.dll
True
+
+ ..\packages\MoonSharp.2.0.0.0\lib\net40-client\MoonSharp.Interpreter.dll
+ True
+
..\packages\NAudio.1.7.3\lib\net35\NAudio.dll
True
@@ -885,6 +889,9 @@
ColorBox
+
+
+
diff --git a/Artemis/Artemis/DAL/ProfileProvider.cs b/Artemis/Artemis/DAL/ProfileProvider.cs
index 011868d59..28d927105 100644
--- a/Artemis/Artemis/DAL/ProfileProvider.cs
+++ b/Artemis/Artemis/DAL/ProfileProvider.cs
@@ -137,7 +137,7 @@ namespace Artemis.DAL
}
catch (Exception e)
{
- Logger.Error("Failed to load profile: {0} - {1}", path, e.InnerException.Message);
+ Logger.Error("Failed to load profile: {0} - {1}", path, e);
}
}
}
diff --git a/Artemis/Artemis/Modules/Games/UnrealTournament/UnrealTournamentViewModel.cs b/Artemis/Artemis/Modules/Games/UnrealTournament/UnrealTournamentViewModel.cs
index 187fb7d36..c3095e307 100644
--- a/Artemis/Artemis/Modules/Games/UnrealTournament/UnrealTournamentViewModel.cs
+++ b/Artemis/Artemis/Modules/Games/UnrealTournament/UnrealTournamentViewModel.cs
@@ -115,9 +115,15 @@ namespace Artemis.Modules.Games.UnrealTournament
private void InstallGif()
{
var gif = Resources.redeemer;
- ProfileProvider.InsertGif(ProfileProvider.GetAll()
- .Where(p => (p.GameName == "UnrealTournament") && (p.Name == "Default")), "Redeemer GIF", gif,
- "redeemer");
+ if (gif == null)
+ return;
+ var utProfiles = ProfileProvider.GetAll()?
+ .Where(p => (p.GameName == "UnrealTournament") && (p.Name == "Default")).ToList();
+
+ if (utProfiles == null || !utProfiles.Any())
+ return;
+
+ ProfileProvider.InsertGif(utProfiles, "Redeemer GIF", gif, "redeemer");
}
}
}
\ No newline at end of file
diff --git a/Artemis/Artemis/packages.config b/Artemis/Artemis/packages.config
index 0c9b6670c..4792a14cc 100644
--- a/Artemis/Artemis/packages.config
+++ b/Artemis/Artemis/packages.config
@@ -13,6 +13,7 @@
+