From c08a6283b8163f2e9d5101142129b3376bd8a7ed Mon Sep 17 00:00:00 2001 From: Drew Tingen Date: Tue, 28 Sep 2021 09:32:07 -0400 Subject: [PATCH] fix: Fixed EnumUtils.GetValuesExceptNone to work for non-flag enums --- ICD.Common.Utils.Tests/EnumUtilsTest.cs | 3 ++- ICD.Common.Utils/EnumUtils.cs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ICD.Common.Utils.Tests/EnumUtilsTest.cs b/ICD.Common.Utils.Tests/EnumUtilsTest.cs index 44daa69..fa60630 100644 --- a/ICD.Common.Utils.Tests/EnumUtilsTest.cs +++ b/ICD.Common.Utils.Tests/EnumUtilsTest.cs @@ -22,7 +22,8 @@ namespace ICD.Common.Utils.Tests A = 1, B = 2, C = 4, - D = 32 + D = 32, + BandC = B | C } [Test] diff --git a/ICD.Common.Utils/EnumUtils.cs b/ICD.Common.Utils/EnumUtils.cs index 9de5d1e..1f16c0c 100644 --- a/ICD.Common.Utils/EnumUtils.cs +++ b/ICD.Common.Utils/EnumUtils.cs @@ -198,7 +198,7 @@ namespace ICD.Common.Utils if (type == null) throw new ArgumentNullException("type"); - return GetFlagsExceptNone(type); + return GetValues(type).Where(v => (int)v != 0); } ///