AaronFiore/electrum
1
0
Fork 0
Code Activity

revert a9fc440, use Clock.schedule_interval to set address. Fixes #6810 and #6817

Browse Source
This commit is contained in:
ThomasV
2020-12-06 11:51:15 +01:00
parent 863cc39995
commit 305ca90647
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
electrum/gui/kivy/uix/dialogs/addresses.py
View File

@@ -1,6 +1,7 @@
from typing import TYPE_CHECKING
from kivy.app import App
from kivy.clock import Clock
from kivy.factory import Factory
from kivy.properties import ObjectProperty
from kivy.lang import Builder
@@ -206,7 +207,8 @@ class AddressPopup(Popup):
self.dismiss()
self.parent_dialog.dismiss()
self.app.switch_to('receive')
self.app.receive_screen.set_address(self.address)
# retry until receive_screen is set
Clock.schedule_interval(lambda dt: bool(self.app.receive_screen.set_address(self.address) and False) if self.app.receive_screen else True, 0.1)
def do_export(self, pk_label):
self.app.export_private_keys(pk_label, self.address)

2
electrum/gui/kivy/uix/screens.py
View File

@@ -71,6 +71,7 @@ class CScreen(Factory.Screen):
pass
def on_activate(self):
setattr(self.app, self.kvname + '_screen', self)
self.update()
def on_leave(self):
@@ -618,7 +619,6 @@ class TabbedCarousel(Factory.TabbedPanel):
if carousel.current_slide != slide:
carousel.current_slide.dispatch('on_leave')
carousel.load_slide(slide)
setattr(slide.app, slide.kvname + '_screen', slide)
slide.dispatch('on_enter')
def add_widget(self, widget, index=0):