Fix some weirdness with come columns

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)

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