# include <sys/select.h>
#endif // HAVE_SYS_SELECT_H
+#ifdef HAVE_SYS_WAIT_H
+# include <sys/wait.h>
+#endif // HAVE_SYS_WAIT_H
+
#include "gettext.h"
#define _(str) gettext(str)
}
openbox->restart();
break;
+ case SIGCHLD:
+ wait(NULL);
+ break;
+
case SIGHUP:
case SIGINT:
case SIGTERM:
sigaction(SIGTERM, &action, (struct sigaction *) 0);
sigaction(SIGINT, &action, (struct sigaction *) 0);
sigaction(SIGHUP, &action, (struct sigaction *) 0);
+ sigaction(SIGCHLD, &action, (struct sigaction *) 0);
+
+ // anything that died while we were restarting won't give us a SIGCHLD
+ while (waitpid(-1, NULL, WNOHANG) > 0);
otk::Timer::initialize();
otk::Property::initialize();
if (_restart) {
if (!_restart_prog.empty()) {
- const std::string &dstr =
- otk::display->screenInfo(first_screen)->displayString();
- otk::putenv(const_cast<char *>(dstr.c_str()));
- execlp(_restart_prog.c_str(), _restart_prog.c_str(), NULL);
+ otk::putenv(otk::display->screenInfo(first_screen)->displayString());
+ execl("/bin/sh", "/bin/sh", "-c", _restart_prog.c_str(), NULL);
perror(_restart_prog.c_str());
}