From cd4b02e62fb8f0a383b7eb2913b15ee76c0e94ad Mon Sep 17 00:00:00 2001 From: kdmukai Date: Sat, 12 Aug 2023 07:38:45 -0500 Subject: [PATCH] routing bugfix Fixes #427 --- src/seedsigner/views/tools_views.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/seedsigner/views/tools_views.py b/src/seedsigner/views/tools_views.py index 8e9b5ef9..75d05ee9 100644 --- a/src/seedsigner/views/tools_views.py +++ b/src/seedsigner/views/tools_views.py @@ -1,16 +1,17 @@ import hashlib import os - import time from embit.descriptor import Descriptor from PIL import Image from PIL.ImageOps import autocontrast + from seedsigner.controller import Controller -from seedsigner.hardware.camera import Camera from seedsigner.gui.components import FontAwesomeIconConstants, GUIConstants, SeedSignerIconConstants from seedsigner.gui.screens import (RET_CODE__BACK_BUTTON, ButtonListScreen) -from seedsigner.gui.screens.tools_screens import ToolsCalcFinalWordDoneScreen, ToolsCalcFinalWordFinalizePromptScreen, ToolsCalcFinalWordScreen, ToolsCoinFlipEntryScreen, ToolsDiceEntropyEntryScreen, ToolsImageEntropyFinalImageScreen, ToolsImageEntropyLivePreviewScreen, ToolsAddressExplorerAddressTypeScreen +from seedsigner.gui.screens.tools_screens import (ToolsCalcFinalWordDoneScreen, ToolsCalcFinalWordFinalizePromptScreen, + ToolsCalcFinalWordScreen, ToolsCoinFlipEntryScreen, ToolsDiceEntropyEntryScreen, ToolsImageEntropyFinalImageScreen, + ToolsImageEntropyLivePreviewScreen, ToolsAddressExplorerAddressTypeScreen) from seedsigner.helpers import embit_utils, mnemonic_generation from seedsigner.models.encode_qr import EncodeQR from seedsigner.models.qr_type import QRType @@ -79,6 +80,7 @@ class ToolsImageEntropyLivePreviewView(View): class ToolsImageEntropyFinalImageView(View): def run(self): if not self.controller.image_entropy_final_image: + from seedsigner.hardware.camera import Camera # Take the final full-res image camera = Camera.get_instance() camera.start_single_frame_mode(resolution=(720, 480)) @@ -560,6 +562,9 @@ class ToolsAddressExplorerAddressTypeView(View): ) if selected_menu_num == RET_CODE__BACK_BUTTON: + # Clear the current flow + self.controller.resume_main_flow = None + self.controller.address_explorer_data = None return Destination(BackStackView) elif button_data[selected_menu_num] in [self.RECEIVE, self.CHANGE]: