Merge pull request #42 from evilC/hotfix/issue-41

Fix #41
evilC · Dec 18, 2019 · 615c8b2 · 615c8b2
2 parents f5b40e1 + 976c883
commit 615c8b2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Deprecated
 ### Removed
 ### Fixed
+- [ViGEm Provider] Fix Issue #41  
+No longer crashes if ViGEm not installed
 
 ## 0.11.1 - 2019-12-15
 ### Added

diff --git a/Source/Core Providers/Core_ViGEm/Core_ViGEm.cs b/Source/Core Providers/Core_ViGEm/Core_ViGEm.cs
@@ -2,6 +2,7 @@
 using Nefarius.ViGEm.Client.Targets;
 using HidWizards.IOWrapper.ProviderInterface;
 using System;
+using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.Diagnostics;
 using System.Linq;
@@ -80,7 +81,7 @@ private void InitLibrary()
 
         public ProviderReport GetOutputList()
         {
-            _providerReport.Devices = _isLive ? devicesHandler.GetDeviceList() : null;
+            if (_isLive) _providerReport.Devices = devicesHandler.GetDeviceList();
             return _providerReport;
         }