From 13c17cd30ddbac30c561dcddbc21f7a7ca9c880c Mon Sep 17 00:00:00 2001 From: Lars Lehtonen Date: Mon, 25 Nov 2019 02:58:35 -0800 Subject: [PATCH] session: Session.Module() swap error return --- session/session.go | 6 +++--- session/session_core_handlers.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/session/session.go b/session/session.go index dcd85160..717006b0 100644 --- a/session/session.go +++ b/session/session.go @@ -155,13 +155,13 @@ func (s *Session) Unlock() { s.WiFi.Unlock() } -func (s *Session) Module(name string) (err error, mod Module) { +func (s *Session) Module(name string) (mod Module, err error) { for _, m := range s.Modules { if m.Name() == name { - return nil, m + return m, nil } } - return fmt.Errorf("module %s not found", name), mod + return mod, fmt.Errorf("module %s not found", name) } func (s *Session) Close() { diff --git a/session/session_core_handlers.go b/session/session_core_handlers.go index 51f40be0..8131374a 100644 --- a/session/session_core_handlers.go +++ b/session/session_core_handlers.go @@ -61,7 +61,7 @@ func (s *Session) generalHelp() { } func (s *Session) moduleHelp(filter string) error { - err, m := s.Module(filter) + m, err := s.Module(filter) if err != nil { return err }