X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.cc;h=6436140db239210613b5f299a450b4062754bae9;hb=11f59d7925068357e24ca743c23019f671e6a5d7;hp=49849ea9e26e54b7f1b6130d59879d8c7e8bf023;hpb=44358dfbaa66592da813ce84e88675dfa293384f;p=chaz%2Fopenbox diff --git a/src/openbox.cc b/src/openbox.cc index 49849ea9..6436140d 100644 --- a/src/openbox.cc +++ b/src/openbox.cc @@ -14,6 +14,7 @@ #include "otk/assassin.hh" #include "otk/property.hh" #include "otk/util.hh" +#include "otk/rendercolor.hh" extern "C" { #include @@ -66,7 +67,7 @@ void Openbox::signalHandler(int signal) openbox->restart(); break; - case SIGCLD: + case SIGCHLD: wait(NULL); break; @@ -121,11 +122,12 @@ Openbox::Openbox(int argc, char **argv) sigaction(SIGTERM, &action, (struct sigaction *) 0); sigaction(SIGINT, &action, (struct sigaction *) 0); sigaction(SIGHUP, &action, (struct sigaction *) 0); - sigaction(SIGCLD, &action, (struct sigaction *) 0); + sigaction(SIGCHLD, &action, (struct sigaction *) 0); - // anything that died while we were restarting won't give us a SIGCLD + // anything that died while we were restarting won't give us a SIGCHLD while (waitpid(-1, NULL, WNOHANG) > 0); + otk::RenderColor::initialize(); otk::Timer::initialize(); otk::Property::initialize(); _actions = new Actions(); @@ -208,6 +210,7 @@ Openbox::~Openbox() //otk::display->destroy(); otk::Timer::destroy(); + otk::RenderColor::destroy(); if (_restart) { if (!_restart_prog.empty()) {