From 2aa96fc819a14e271f5054dbf065daab18fb2b92 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Wed, 9 Oct 2019 13:30:01 +0300 Subject: [PATCH] Do not crash when user cancels setting of projection range --- .../itemProjectionRange.py | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/gui/builtinContextMenus/itemProjectionRange.py b/gui/builtinContextMenus/itemProjectionRange.py index 987eaee03..2e69e2d30 100644 --- a/gui/builtinContextMenus/itemProjectionRange.py +++ b/gui/builtinContextMenus/itemProjectionRange.py @@ -52,19 +52,18 @@ class ChangeItemProjectionRange(ContextMenuCombined): newRange = cleanInputFloat * 1000 else: newRange = None - - fitID = self.mainFrame.getActiveFit() - items = selection - if wx.GetMouseState().GetModifiers() in (wx.MOD_ALT, wx.MOD_CONTROL): - if isinstance(mainItem, EosModule): - fit = Fit.getInstance().getFit(fitID) - positions = getSimilarModPositions(fit.projectedModules, mainItem) - items = [fit.projectedModules[p] for p in positions] - elif isinstance(mainItem, EosFighter): - fit = Fit.getInstance().getFit(fitID) - items = getSimilarFighters(fit.projectedFighters, mainItem) - self.mainFrame.command.Submit(cmd.GuiChangeProjectedItemsProjectionRangeCommand( - fitID=fitID, items=items, projectionRange=newRange)) + fitID = self.mainFrame.getActiveFit() + items = selection + if wx.GetMouseState().GetModifiers() in (wx.MOD_ALT, wx.MOD_CONTROL): + if isinstance(mainItem, EosModule): + fit = Fit.getInstance().getFit(fitID) + positions = getSimilarModPositions(fit.projectedModules, mainItem) + items = [fit.projectedModules[p] for p in positions] + elif isinstance(mainItem, EosFighter): + fit = Fit.getInstance().getFit(fitID) + items = getSimilarFighters(fit.projectedFighters, mainItem) + self.mainFrame.command.Submit(cmd.GuiChangeProjectedItemsProjectionRangeCommand( + fitID=fitID, items=items, projectionRange=newRange)) ChangeItemProjectionRange.register()