Merge branch 'master' of evefit.org:pyfa

2011-01-14 10:26:45 +02:00
parent 322d469d03 3524b2cc7f
commit 8ff77b765d
1 changed files with 10 additions and 1 deletions
--- a/gui/builtinViewColumns/ammo.py
+++ b/gui/builtinViewColumns/ammo.py
@@ -31,7 +31,16 @@ class Ammo(ViewColumn):
        self.bitmap = bitmapLoader.getBitmap("damagePattern_small", "icons")

    def getText(self, stuff):
-        return "%s (%s)" % (stuff.charge.name, stuff.numCharges) if getattr(stuff, "charge", None) is not None else ""
+        if getattr(stuff, "charge", None) is not None:
+            shots = stuff.numShots
+            if shots > 0:
+                text = "%s (%s)" % (stuff.charge.name, stuff.numShots)
+            else:
+                text = stuff.charge.name
+        else:
+            text = ""
+
+        return text


    def getImageId(self, mod):