From 976c883a1a3c0236cae613284012d0bcd137f114 Mon Sep 17 00:00:00 2001
From: Clive Galway <evilc@evilc.com>
Date: Wed, 18 Dec 2019 18:22:11 +0000
Subject: [PATCH] Fix #41

---
 CHANGELOG.md                                   | 2 ++
 Source/Core Providers/Core_ViGEm/Core_ViGEm.cs | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index df407ed..3f5e6a1 100644
--- 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
index 40c8595..67e10f2 100644
--- 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;
         }