Crash Fix

chummer5a · Nov 30, 2022 · 3b91117 · 3b91117
1 parent 1f5c1fd
commit 3b91117
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/Chummer/Backend/Equipment/Weapon.cs b/Chummer/Backend/Equipment/Weapon.cs
@@ -6184,15 +6184,20 @@ private Skill Skill
                     strSkill = UseSkill;
                     strSpec = string.Empty;
 
-                    if (ExoticSkill.IsExoticSkillName(_objCharacter, UseSkill))
+                    (bool blnIsExotic, string strSkillName)
+                        = ExoticSkill.IsExoticSkillNameTuple(_objCharacter, UseSkill);
+                    if (blnIsExotic)
+                    {
+                        strSkill = strSkillName;
                         strSpec = UseSkillSpec;
+                    }
                 }
 
                 // Locate the Active Skill to be used.
                 Skill objSkill = _objCharacter.SkillsSection.GetActiveSkill(strSkill);
-                if (string.IsNullOrEmpty(strSpec) || objSkill.HasSpecialization(strSpec)
-                                                  || objSkill.HasSpecialization(Name) || (!string.IsNullOrEmpty(Spec2)
-                                                      && objSkill.HasSpecialization(Spec2)))
+                if (string.IsNullOrEmpty(strSpec) || objSkill == null || objSkill.HasSpecialization(strSpec)
+                    || objSkill.HasSpecialization(Name)
+                    || (!string.IsNullOrEmpty(Spec2) && objSkill.HasSpecialization(Spec2)))
                     return objSkill;
                 return null;
             }