From 04d3666099f966f988789fb424215e425620272b Mon Sep 17 00:00:00 2001 From: matzman Date: Thu, 4 Feb 2016 20:59:44 +0100 Subject: [PATCH] Fixed a crash in quick-aid widget when no save is loaded. --- widgets/quickaid/quickaidwidget.py | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/widgets/quickaid/quickaidwidget.py b/widgets/quickaid/quickaidwidget.py index a22a8f7..70f8fef 100644 --- a/widgets/quickaid/quickaidwidget.py +++ b/widgets/quickaid/quickaidwidget.py @@ -50,26 +50,34 @@ def StatsDataUpdated(self, caller, value, pathObjs): def StimpakButtonClicked(self): # Apparently need to do this because it raises a no items exception if self.StatsData: - Stimpaks = self.StatsData.child("StimpakCount").value() + Stimpaks = self.StatsData.child("StimpakCount") - if Stimpaks > 0: + if Stimpaks and Stimpaks.value() > 0: self.DataManager.rpcUseStimpak() @QtCore.pyqtSlot() def RadAwayButtonClicked(self): # Apparently need to do this because it raises a no items exception if self.StatsData: - Radaways = self.StatsData.child("RadawayCount").value() + Radaways = self.StatsData.child("RadawayCount") - if Radaways > 0: + if Radaways and Radaways.value() > 0: self.DataManager.rpcUseRadAway() @QtCore.pyqtSlot() def UpdateUI(self): if self.isVisible(): if self.StatsData: - Stimpaks = self.StatsData.child("StimpakCount").value() - Radaways = self.StatsData.child("RadawayCount").value() + Stimpaks = self.StatsData.child("StimpakCount") + if Stimpaks: + Stimpaks = Stimpaks.value() + else: + Stimpaks = 0 + Radaways = self.StatsData.child("RadawayCount") + if Radaways: + Radaways = Radaways.value() + else: + Radaways = 0 if Stimpaks > 0: self.Widgets.stimpakButton.setEnabled(True)