Fix menus not being reloaded in certain situations.
SVN revision: 44421
This commit is contained in:
parent
1574c0a3b4
commit
2c425f068e
|
@ -636,6 +636,7 @@ MenuEmpty(Menu * m, int destroying)
|
||||||
|
|
||||||
FreePmapMask(&m->pmm);
|
FreePmapMask(&m->pmm);
|
||||||
|
|
||||||
|
m->last_change = 0;
|
||||||
m->filled = 0;
|
m->filled = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -655,6 +656,7 @@ MenuFreePixmaps(Menu * m)
|
||||||
|
|
||||||
FreePmapMask(&m->pmm);
|
FreePmapMask(&m->pmm);
|
||||||
|
|
||||||
|
m->last_change = 0;
|
||||||
m->filled = 0;
|
m->filled = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2022,7 +2024,6 @@ MenusTimeout(void *data __UNUSED__)
|
||||||
ts - m->last_access < MENU_UNLOAD_CHECK_INTERVAL)
|
ts - m->last_access < MENU_UNLOAD_CHECK_INTERVAL)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
m->last_change = 0;
|
|
||||||
if (!m->loader)
|
if (!m->loader)
|
||||||
MenuFreePixmaps(m);
|
MenuFreePixmaps(m);
|
||||||
else if (m->ref_count)
|
else if (m->ref_count)
|
||||||
|
|
Loading…
Reference in New Issue