Including the profile when using tickets (use_ticket function), so core can save which profile has which ticket for future features such as respawn.
This commit is contained in:
parent
bd9b4ee106
commit
db1f903b0b
3 changed files with 13 additions and 5 deletions
|
|
@ -104,6 +104,7 @@ class TicketOrBillingChoicePage(Page):
|
|||
'id': int(profile_id),
|
||||
'use_ticket': which_ticket,
|
||||
'ticket_location': candidates[0],
|
||||
'profile': profile
|
||||
}
|
||||
menu_page = self.custom_window.navigator.get_cached("menu")
|
||||
if menu_page:
|
||||
|
|
|
|||
|
|
@ -73,10 +73,11 @@ class TicketingWorkerThread(QThread):
|
|||
self.saved_blind_prep_done.emit(result)
|
||||
elif self.action == 'USE_TICKET':
|
||||
result = use_ticket(
|
||||
self.params['which_ticket'],
|
||||
self.params['which_location'],
|
||||
ticket_observer,
|
||||
connection_observer,
|
||||
which_ticket=self.params['which_ticket'],
|
||||
which_location=self.params['which_location'],
|
||||
ticket_observer=ticket_observer,
|
||||
connection_observer=connection_observer,
|
||||
profile=self.params['profile']
|
||||
)
|
||||
self.use_done.emit(result)
|
||||
except Exception as e:
|
||||
|
|
|
|||
|
|
@ -215,7 +215,13 @@ class Worker(QObject):
|
|||
last_msg = None
|
||||
for cand in candidates:
|
||||
try:
|
||||
outcome = use_ticket(which_ticket, cand, ticket_observer, connection_observer)
|
||||
outcome = use_ticket(
|
||||
which_ticket=which_ticket,
|
||||
which_location=cand,
|
||||
ticket_observer=ticket_observer,
|
||||
connection_observer=connection_observer,
|
||||
profile=self.profile
|
||||
)
|
||||
except Exception as e:
|
||||
last_msg = str(e)
|
||||
continue
|
||||
|
|
|
|||
Loading…
Reference in a new issue