From 7a1634a38779b43c34d1024b1f26604b2dbc5cdf Mon Sep 17 00:00:00 2001
From: Pietro Gagliardi <pietro10@mac.com>
Date: Fri, 24 Apr 2015 15:45:58 -0400
Subject: [PATCH] Made menu IDs on Windows global across all menus. This is
 what we actually intended...

---
 new/windows/menu.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/new/windows/menu.c b/new/windows/menu.c
index b8db9155..b1eaa7f7 100644
--- a/new/windows/menu.c
+++ b/new/windows/menu.c
@@ -7,6 +7,7 @@ static struct menu *menus = NULL;
 static uintmax_t len = 0;
 static uintmax_t cap = 0;
 static BOOL menusFinalized = FALSE;
+static WORD curID = 100;			// start somewhere safe
 
 struct menu {
 	uiMenu m;
@@ -14,7 +15,6 @@ struct menu {
 	struct menuItem *items;
 	uintmax_t len;
 	uintmax_t cap;
-	WORD curID;
 };
 
 struct menuItem {
@@ -143,8 +143,8 @@ static uiMenuItem *newItem(struct menu *m, int type, const char *name)
 	}
 
 	if (item->type != typeSeparator) {
-		item->id = m->curID;
-		m->curID++;
+		item->id = curID;
+		curID++;
 	}
 	// TODO this shouldn't be necessary, but uiRealloc() doesn't yet zero out new bytes
 	else
@@ -228,9 +228,6 @@ uiMenu *uiNewMenu(const char *name)
 	m->len = 0;
 	m->cap = 0;
 
-	// start somewhere safe
-	m->curID = 100;
-
 	uiMenu(m)->AppendItem = menuAppendItem;
 	uiMenu(m)->AppendCheckItem = menuAppendCheckItem;
 	uiMenu(m)->AppendQuitItem = menuAppendQuitItem;