From 807102ada265383df3c947d37f0192c5ef6cbbae Mon Sep 17 00:00:00 2001 From: Nick Craig-Wood Date: Tue, 13 Jul 2021 14:53:21 +0100 Subject: [PATCH] drive: fix config system overwriting team drive ID - fixes #5454 --- backend/drive/drive.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/backend/drive/drive.go b/backend/drive/drive.go index 29185b1cd..d1ec46173 100755 --- a/backend/drive/drive.go +++ b/backend/drive/drive.go @@ -210,12 +210,19 @@ func init() { if opt.TeamDriveID == "" { return fs.ConfigConfirm("teamdrive_ok", false, "config_change_team_drive", "Configure this as a Shared Drive (Team Drive)?\n") } - return fs.ConfigConfirm("teamdrive_ok", false, "config_change_team_drive", fmt.Sprintf("Change current Shared Drive (Team Drive) ID %q?\n", opt.TeamDriveID)) + return fs.ConfigConfirm("teamdrive_change", false, "config_change_team_drive", fmt.Sprintf("Change current Shared Drive (Team Drive) ID %q?\n", opt.TeamDriveID)) case "teamdrive_ok": if config.Result == "false" { m.Set("team_drive", "") return nil, nil } + return fs.ConfigGoto("teamdrive_config") + case "teamdrive_change": + if config.Result == "false" { + return nil, nil + } + return fs.ConfigGoto("teamdrive_config") + case "teamdrive_config": f, err := newFs(ctx, name, "", m) if err != nil { return nil, errors.Wrap(err, "failed to make Fs to list Shared Drives")