Merge branch 'master' into development

Conflicts:
	gui/builtinContextMenus/amount.py
	gui/builtinStatsViews/priceViewFull.py
	service/fit.py
	service/prefetch.py

gui/builtinContextMenus/amount.py

@@ -49,6 +49,11 @@ class AmountChanger(wx.Dialog):
         self.button.Bind(wx.EVT_BUTTON, self.change)
 
     def change(self, event):
+        sFit = Fit.getInstance()
+        if self.input.GetLineText(0).strip() == '':
+            event.Skip()
+            return
+
         sFit = Fit.getInstance()
         mainFrame = gui.mainFrame.MainFrame.getInstance()
         fitID = mainFrame.getActiveFit()
@@ -63,7 +68,6 @@ class AmountChanger(wx.Dialog):
         wx.PostEvent(mainFrame, GE.FitChanged(fitID=fitID))
 
         event.Skip()
-        self.Close()
 
     # checks to make sure it's valid number
     def onChar(self, event):

gui/builtinStatsViews/priceViewFull.py

@@ -82,16 +82,14 @@ class PriceViewFull(StatsView):
                     typeIDs.append(mod.itemID)
 
             for drone in fit.drones:
-                for _ in range(drone.amount):
-                    typeIDs.append(drone.itemID)
+                typeIDs.append(drone.itemID)
 
             for fighter in fit.fighters:
-                for _ in range(fighter.amountActive):
+                if fighter.amountActive > 0:
                     typeIDs.append(fighter.itemID)
 
             for cargo in fit.cargo:
-                for _ in range(cargo.amount):
-                    typeIDs.append(cargo.itemID)
+                typeIDs.append(cargo.itemID)
 
             sMkt = Market.getInstance()
             sMkt.getPrices(typeIDs, self.processPrices)

gui/mainFrame.py

@@ -107,6 +107,7 @@ class PFPanel(wx.Panel):
 class OpenFitsThread(threading.Thread):
     def __init__(self, fits, callback):
         threading.Thread.__init__(self)
+        self.name = "LoadingOpenFits"
         self.mainFrame = MainFrame.getInstance()
         self.callback = callback
         self.fits = fits

gui/utils/exportHtml.py

@@ -31,6 +31,7 @@ class exportHtml():
 class exportHtmlThread(threading.Thread):
     def __init__(self, callback=False):
         threading.Thread.__init__(self)
+        self.name = "HTMLExport"
         self.callback = callback
         self.stopRunning = False