Skip to content

Commit c69461d

Browse files
author
ChengNan
committed
Fix Klockwork critical issues
1 parent b6c8a73 commit c69461d

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/ViveColliderEvent/ViveColliderEventData.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public static bool IsVivePadAxis(this ColliderAxisEventData eventData, HandRole
116116

117117
if (!(eventData is ViveColliderPadAxisEventData)) { return false; }
118118

119-
return (eventData as ViveColliderTriggerAxisEventData).viveRole.IsRole(hand);
119+
return (eventData as ViveColliderPadAxisEventData).viveRole.IsRole(hand);
120120
}
121121

122122
public static bool IsVivePadAxisEx<TRole>(this ColliderAxisEventData eventData, TRole role)
@@ -125,7 +125,7 @@ public static bool IsVivePadAxisEx<TRole>(this ColliderAxisEventData eventData,
125125

126126
if (!(eventData is ViveColliderPadAxisEventData)) { return false; }
127127

128-
return (eventData as ViveColliderTriggerAxisEventData).viveRole.IsRole(role);
128+
return (eventData as ViveColliderPadAxisEventData).viveRole.IsRole(role);
129129
}
130130

131131
public static bool TryGetVivePadAxisEventData(this ColliderAxisEventData eventData, out ViveColliderPadAxisEventData viveEventData)

Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/ViveRole/ViveRoleEnum.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,8 @@ public GenericInfo()
183183

184184
for (int i = 0; i < roleEnums.Length; ++i)
185185
{
186+
if (roleEnums[i] == null) continue;
187+
186188
var roleValue = ToRoleValue(roleEnums[i]);
187189

188190
m_nameTable.Add(GetNameByElementIndex(i), roleEnums[i]);

0 commit comments

Comments
 (0)