From 8e353b08ae7014fc5888a86934433fdb95312680 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Sun, 4 Oct 2015 17:16:48 -0400 Subject: [PATCH] Fix some weirdness with come columns --- gui/builtinViewColumns/ammo.py | 2 +- gui/builtinViewColumns/baseName.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gui/builtinViewColumns/ammo.py b/gui/builtinViewColumns/ammo.py index 5f9a227ab..ba22229af 100644 --- a/gui/builtinViewColumns/ammo.py +++ b/gui/builtinViewColumns/ammo.py @@ -35,7 +35,7 @@ class Ammo(ViewColumn): charges = stuff.numCharges if charges > 0: cycles = stuff.numShots - if charges != cycles: + if cycles !=0 and charges != cycles: return "%s (%d, %d cycles)" % (stuff.charge.name, charges, cycles) else: return "%s (%d)" % (stuff.charge.name, charges) diff --git a/gui/builtinViewColumns/baseName.py b/gui/builtinViewColumns/baseName.py index d422756a9..e5f59a9e2 100644 --- a/gui/builtinViewColumns/baseName.py +++ b/gui/builtinViewColumns/baseName.py @@ -70,6 +70,7 @@ class BaseName(ViewColumn): if marketShortcut: # use unicode subscript to display shortcut value shortcut = unichr(marketShortcut+8320)+u" " + del item.marketShortcut return shortcut+item.name return item.name