in progress

sip/asterisk/ami/originate.go

@@ -21,16 +21,18 @@ func (s *Client) Originate(req *OriginateRequest) (*Originate, error) {
 		timeout = req.Timeout + time.Millisecond*500
 	}
 
+	res := initOriginate(req, s)
+
 	resp, check := s.Request(req.Request(), timeout)
 	if !check {
+		s.removeEventListener(req.uuid)
 		return nil, errors.New("Originate request timeout")
 	}
 	if resp.IsError() {
+		s.removeEventListener(req.uuid)
 		return nil, fmt.Errorf("Originate error: %v", resp.ErrorMessage())
 	}
 
-	res := initOriginate(req, s)
-
 	return res, nil
 }