Signed-off-by: Christophe CURIS <christophe.cu...@free.fr>
Not reported by Coverity, which is strange because that's the kind of thing it
is good at pointing. I probably just did not enable USER_MENU.
----- David Maciejak <david.macie...@gmail.com> a écrit :
> remove unused var and move wwin check
>
> ---
> src/usermenu.c | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/src/usermenu.c b/src/usermenu.c
> index 4a669c9..c349810 100644
> --- a/src/usermenu.c
> +++ b/src/usermenu.c
> @@ -279,7 +279,6 @@ static WMenu *configureUserMenu(WScreen * scr,
> WMPropList * plum)
>
> void wUserMenuRefreshInstances(WMenu * menu, WWindow * wwin)
> {
> - WMenuEntry *entry;
> int i, j, count, paintflag;
>
> paintflag = 0;
> @@ -335,7 +334,7 @@ WMenu *wUserMenuGet(WScreen * scr, WWindow * wwin)
> WMenu *menu = NULL;
> char *path = NULL;
> char *tmp;
> - if (wwin->wm_instance && wwin->wm_class) {
> + if (wwin && wwin->wm_instance && wwin->wm_class) {
> int len = strlen(wwin->wm_instance) + strlen(wwin->wm_class) + 7;
> tmp = wmalloc(len);
> snprintf(tmp, len, "%s.%s.menu", wwin->wm_instance, wwin->wm_class);
> @@ -345,9 +344,7 @@ WMenu *wUserMenuGet(WScreen * scr, WWindow * wwin)
> if (!path)
> return NULL;
>
> - if (wwin)
> - menu = readUserMenuFile(scr, path);
> -
> + menu = readUserMenuFile(scr, path);
> wfree(path);
> }
> return menu;
> --
> 1.8.3.2
--
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
