Merge pull request #18 from tmm1/patch-1

Generate RT_GROUP_ICON id before ICON ids
josephspurrier · Dec 5, 2017 · bbb37d9 · bbb37d9
2 parents d9adecf + 73fc896
commit bbb37d9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/icon.go b/icon.go
@@ -77,14 +77,14 @@ func addIcon(coff *coff.Coff, fname string, newID <-chan uint16) error {
 			Type:     1, // magic num.
 			Count:    uint16(len(icons)),
 		}}
+		gid := <-newID
 		for _, icon := range icons {
 			id := <-newID
 			r := io.NewSectionReader(f, int64(icon.ImageOffset), int64(icon.BytesInRes))
 			coff.AddResource(rtIcon, id, r)
 			group.Entries = append(group.Entries, gRPICONDIRENTRY{IconDirEntryCommon: icon.IconDirEntryCommon, ID: id})
 		}
-		id := <-newID
-		coff.AddResource(rtGroupIcon, id, group)
+		coff.AddResource(rtGroupIcon, gid, group)
 	}
 
 	return nil