layout: avoid nil dereference in ResultLocale

3 years ago · 90abbce6dd
parent 86e6d40b1b
commit 90abbce6dd
1 changed files with 6 additions and 2 deletions
--- a/layout/layout.go
+++ b/layout/layout.go
@ -469,8 +469,12 @@ func (lt *Layout) ResultLocale(locale, k string, args ...interface{}) tele.Resul
 		r.SetContent(base.Content)
 	}
 	if result.Markup != "" {
-		markup := lt.MarkupLocale(locale, result.Markup)
-		r.SetReplyMarkup(markup.InlineKeyboard)
+		markup := lt.MarkupLocale(locale, result.Markup, args...)
+		if markup == nil {
+			log.Printf("telebot/layout: markup with name %s was not found\n", result.Markup)
+		} else {
+			r.SetReplyMarkup(markup.InlineKeyboard)
+		}
 	}

 	return r