Removing redundant statuscmds logic when both statuscmd and dwmblocks patches are applied

This commit is contained in:
bakkeby
2020-05-05 19:50:28 +02:00
parent 75d5f1e0c5
commit 91291ceb9f
3 changed files with 11 additions and 9 deletions

12
dwm.c
View File

@@ -3184,14 +3184,14 @@ sigchld(int unused)
void
spawn(const Arg *arg)
{
#if STATUSCMD_PATCH
#if STATUSCMD_PATCH && !DWMBLOCKS_PATCH
char *cmd = NULL;
#endif // STATUSCMD_PATCH
#endif // STATUSCMD_PATCH | DWMBLOCKS_PATCH
#if !NODMENU_PATCH
if (arg->v == dmenucmd)
dmenumon[0] = '0' + selmon->num;
#endif // NODMENU_PATCH
#if STATUSCMD_PATCH
#if STATUSCMD_PATCH && !DWMBLOCKS_PATCH
#if !NODMENU_PATCH
else if (arg->v == statuscmd)
#else
@@ -3206,7 +3206,7 @@ spawn(const Arg *arg)
cmd[LENGTH(statusexport)-3] = '0' + lastbutton;
statuscmd[2] = cmd;
}
#endif // STATUSCMD_PATCH
#endif // STATUSCMD_PATCH | DWMBLOCKS_PATCH
if (fork() == 0) {
if (dpy)
@@ -3251,9 +3251,9 @@ spawn(const Arg *arg)
perror(" failed");
exit(EXIT_SUCCESS);
}
#if STATUSCMD_PATCH
#if STATUSCMD_PATCH && !DWMBLOCKS_PATCH
free(cmd);
#endif // STATUSCMD_PATCH
#endif // STATUSCMD_PATCH | DWMBLOCKS_PATCH
}
void