From 921c59f195735b0ab539013e4aa7700bf0c3f7df Mon Sep 17 00:00:00 2001 From: David Florness Date: Tue, 19 Jan 2021 17:58:06 -0500 Subject: [PATCH] Only show election screen if local voter *hasn't* voted --- cmd/tallyard/main.go | 2 +- ui/tui.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/tallyard/main.go b/cmd/tallyard/main.go index a193c20..098dcee 100644 --- a/cmd/tallyard/main.go +++ b/cmd/tallyard/main.go @@ -129,7 +129,7 @@ func main() { }() el := ui.TUI(client, data.Elections) - if el == nil { + if el == nil || el.LocalVoter.Ballot == nil { // user likely hit C-c return } diff --git a/ui/tui.go b/ui/tui.go index ce0f176..ae41ced 100644 --- a/ui/tui.go +++ b/ui/tui.go @@ -111,7 +111,7 @@ func RoomTUI(client *mautrix.Client, roomID id.RoomID, elections *election.Elect el = elections.GetI(i - 1) // don't need to lock because this goroutine controls LocalVoter if el.LocalVoter != nil { - if el.LocalVoter.Ballot != nil { + if el.LocalVoter.Ballot == nil { ElectionTUI(client, el) } } else if joinElectionConfirmation(el) { -- 2.38.4