From d266aa796e5a50db54015c059cd73e71fcb69569 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Tue, 20 Aug 2019 00:47:49 +0300 Subject: [PATCH] Do not crash on damage/target profiles named like [this] --- gui/builtinContextMenus/damagePatternChange.py | 6 +++++- gui/builtinContextMenus/targetProfile/switcher.py | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/gui/builtinContextMenus/damagePatternChange.py b/gui/builtinContextMenus/damagePatternChange.py index a2d9c640d..7e6270ad0 100644 --- a/gui/builtinContextMenus/damagePatternChange.py +++ b/gui/builtinContextMenus/damagePatternChange.py @@ -40,8 +40,12 @@ class ChangeDamagePattern(ContextMenuUnconditional): start, end = pattern.name.find('['), pattern.name.find(']') if start is not -1 and end is not -1: currBase = pattern.name[start + 1:end] + name = pattern.name[end + 1:].strip() + if not name: + self.singles.append(pattern) + continue # set helper attr - setattr(pattern, "_name", pattern.name[end + 1:].strip()) + setattr(pattern, "_name", name) if currBase not in self.subMenus: self.subMenus[currBase] = [] self.subMenus[currBase].append(pattern) diff --git a/gui/builtinContextMenus/targetProfile/switcher.py b/gui/builtinContextMenus/targetProfile/switcher.py index 66ee53237..3f8c01705 100644 --- a/gui/builtinContextMenus/targetProfile/switcher.py +++ b/gui/builtinContextMenus/targetProfile/switcher.py @@ -68,8 +68,12 @@ class TargetProfileSwitcher(ContextMenuUnconditional): start, end = profile.name.find('['), profile.name.find(']') if start is not -1 and end is not -1: currBase = profile.name[start + 1:end] + name = profile.name[end + 1:].strip() + if not name: + self.singles.append(profile) + continue # set helper attr - setattr(profile, '_name', profile.name[end + 1:].strip()) + setattr(profile, '_name', name) if currBase not in self.subMenus: self.subMenus[currBase] = [] self.subMenus[currBase].append(profile)