From ff19af0b5f7518129524401fb8c27492d2634e2f Mon Sep 17 00:00:00 2001 From: jwijenbergh Date: Tue, 19 Jul 2022 10:05:11 +0200 Subject: Server: Give JSON for the configured servers used in the main screen --- state.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'state.go') diff --git a/state.go b/state.go index def8206..55bf705 100644 --- a/state.go +++ b/state.go @@ -32,10 +32,10 @@ type VPNState struct { } func (state *VPNState) GetSavedServers() string { - serversJSON, serversJSONErr := state.Servers.GetJSON() + serversJSON, serversJSONErr := state.Servers.GetServersConfiguredJSON() if serversJSONErr != nil { - return "" + return "{}" } return serversJSON @@ -100,7 +100,9 @@ func (state *VPNState) GoBack() error { return &types.WrappedErrorMessage{Message: errorMessage, Err: fsm.DeregisteredError{}.CustomError()} } - state.FSM.GoBack() + // FIXME: Abitrary back transitions don't work because we need the approriate data + state.FSM.GoTransitionWithData(fsm.NO_SERVER, state.GetSavedServers(), false) + //state.FSM.GoBack() return nil } -- cgit v1.2.3