summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2003-02-03 04:11:58 +0000
committerDana Jansens <danakj@orodu.net>2003-02-03 04:11:58 +0000
commitf5904cdaaafa95e8ab6ffde212dfc6b7478b4e32 (patch)
tree7bd9bfa78c1aacd92dc1aa3f8a24f0ddec0dcaa9
parent478f240c7f6fa439322e8f0bf25a20ad343cd8f9 (diff)
delete the openbox class, to shut things down properly!
-rw-r--r--src/main.cc13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/main.cc b/src/main.cc
index e59749aa..83cbf516 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -36,11 +36,14 @@ int main(int argc, char **argv) {
bind_textdomain_codeset(PACKAGE, "UTF-8");
textdomain(PACKAGE);
- ob::Openbox openbox(argc, argv);
- openbox.eventLoop();
+ ob::Openbox *openbox = new ob::Openbox(argc, argv);
+ openbox->eventLoop();
- if (openbox.doRestart()) {
- const std::string &prog = openbox.restartProgram();
+ if (openbox->doRestart()) {
+ std::string prog = openbox->restartProgram();
+
+ delete openbox; // shutdown the current one!
+
if (!prog.empty()) {
execl("/bin/sh", "/bin/sh", "-c", prog.c_str(), NULL);
perror(prog.c_str());
@@ -50,4 +53,6 @@ int main(int argc, char **argv) {
execvp(argv[0], argv);
execvp(otk::basename(argv[0]).c_str(), argv);
}
+
+ delete openbox; // shutdown
}