fixed memory leaks for strftime_format and rootcommand

[chaz/openbox] / src / openbox.cc

diff --git a/src/openbox.cc b/src/openbox.cc
index 25d274f1ae60e7425d3ee9773fa351618be3a814..d048837875b1a0107c9d374d970cb60a2ac833c0 100644 (file)
--- a/src/openbox.cc
+++ b/src/openbox.cc
@@ -261,6 +261,9 @@ Openbox::~Openbox() {
   if (resource.style_file)
     delete [] resource.style_file;
 
+  if (resource.titlebar_layout)
+    delete [] resource.titlebar_layout;
+
   delete timer;
 
   delete screenList;
@@ -1001,7 +1004,7 @@ void Openbox::save() {
 
 void Openbox::load() {
   if (!config.load())
-    return;
+    config.create();
 
   std::string s;
   long l;
@@ -1137,15 +1140,16 @@ void Openbox::real_rereadMenu() {
 }
 
 
-void Openbox::saveStyleFilename(const char *filename) {
+void Openbox::setStyleFilename(const char *filename) {
   if (resource.style_file)
     delete [] resource.style_file;
 
   resource.style_file = bstrdup(filename);
+  config.setValue("session.styleFile", resource.style_file);
 }
 
 
-void Openbox::saveMenuFilename(const char *filename) {
+void Openbox::setMenuFilename(const char *filename) {
   Bool found = False;
 
   LinkedListIterator<MenuTimestamp> it(menuTimestamps);