Fix crash on invalid team

42wim · 42wim · commit c769e23a9a31 · 2016-07-22T23:47:25.000+02:00
diff --git a/matterclient/matterclient.go b/matterclient/matterclient.go
@@ -144,11 +144,11 @@ func (m *MMClient) Login() error {
 		return err
 	}
 
-	// set our team id as default route
-	m.Client.SetTeamId(m.Team.Id)
 	if m.Team == nil {
 		return errors.New("team not found")
 	}
+	// set our team id as default route
+	m.Client.SetTeamId(m.Team.Id)
 
 	// setup websocket connection
 	wsurl := wsScheme + m.Credentials.Server + "/api/v3/users/websocket"

Original file line number	Diff line number	Diff line change
`@@ -144,11 +144,11 @@ func (m *MMClient) Login() error {`
`144`	`144`	`return err`
`145`	`145`	`}`
`146`	`146`
`147`		`- // set our team id as default route`
`148`		`- m.Client.SetTeamId(m.Team.Id)`
`149`	`147`	`if m.Team == nil {`
`150`	`148`	`return errors.New("team not found")`
`151`	`149`	`}`
	`150`	`+ // set our team id as default route`
	`151`	`+ m.Client.SetTeamId(m.Team.Id)`
`152`	`152`
`153`	`153`	`// setup websocket connection`
`154`	`154`	`wsurl := wsScheme + m.Credentials.Server + "/api/v3/users/websocket"`