Adding `Value.IsValid()` check in `NickMode.String()`. Fixes #98

This commit is contained in:
Dale Campbell 2017-03-23 02:06:33 +00:00
parent 64ad58533d
commit a3cd605787
1 changed files with 15 additions and 11 deletions

View File

@ -144,7 +144,9 @@ func (nk *Nick) Equals(other *Nick) bool {
// Duplicates a NickMode struct.
func (nm *NickMode) Copy() *NickMode {
if nm == nil { return nil }
if nm == nil {
return nil
}
n := *nm
return &n
}
@ -183,18 +185,20 @@ func (nk *nick) String() string {
func (nm *NickMode) String() string {
str := "+"
v := reflect.Indirect(reflect.ValueOf(nm))
t := v.Type()
for i := 0; i < v.NumField(); i++ {
switch f := v.Field(i); f.Kind() {
// only bools here at the mo!
case reflect.Bool:
if f.Bool() {
str += NickModeToString[t.Field(i).Name]
if v.IsValid() {
t := v.Type()
for i := 0; i < v.NumField(); i++ {
switch f := v.Field(i); f.Kind() {
// only bools here at the mo!
case reflect.Bool:
if f.Bool() {
str += NickModeToString[t.Field(i).Name]
}
}
}
}
if str == "+" {
str = "No modes set"
if str == "+" {
str = "No modes set"
}
}
return str
}