fixed memory leak in screen::load()
This commit is contained in:
parent
e75d3560a6
commit
8f8eba7b96
1 changed files with 8 additions and 2 deletions
|
@ -1192,8 +1192,11 @@ void BScreen::load() {
|
||||||
rname.seekp(0); rclass.seekp(0);
|
rname.seekp(0); rclass.seekp(0);
|
||||||
rname << rscreen.str() << "strftimeFormat" << ends;
|
rname << rscreen.str() << "strftimeFormat" << ends;
|
||||||
rclass << rscreen.str() << "StrftimeFormat" << ends;
|
rclass << rscreen.str() << "StrftimeFormat" << ends;
|
||||||
if (config.getValue(rname.str(), rclass.str(), s))
|
if (config.getValue(rname.str(), rclass.str(), s)) {
|
||||||
|
if (resource.strftime_format != NULL)
|
||||||
|
delete [] resource.strftime_format;
|
||||||
resource.strftime_format = bstrdup(s.c_str());
|
resource.strftime_format = bstrdup(s.c_str());
|
||||||
|
}
|
||||||
#else // !HAVE_STRFTIME
|
#else // !HAVE_STRFTIME
|
||||||
rname.seekp(0); rclass.seekp(0);
|
rname.seekp(0); rclass.seekp(0);
|
||||||
rname << rscreen.str() << "dateFormat" << ends;
|
rname << rscreen.str() << "dateFormat" << ends;
|
||||||
|
@ -1230,8 +1233,11 @@ void BScreen::load() {
|
||||||
rname.seekp(0); rclass.seekp(0);
|
rname.seekp(0); rclass.seekp(0);
|
||||||
rname << rscreen.str() << "rootCommand" << ends;
|
rname << rscreen.str() << "rootCommand" << ends;
|
||||||
rclass << rscreen.str() << "RootCommand" << ends;
|
rclass << rscreen.str() << "RootCommand" << ends;
|
||||||
if (config.getValue(rname.str(), rclass.str(), s))
|
if (config.getValue(rname.str(), rclass.str(), s)) {
|
||||||
|
if (resource.root_command != NULL)
|
||||||
|
delete [] resource.root_command;
|
||||||
resource.root_command = bstrdup(s.c_str());
|
resource.root_command = bstrdup(s.c_str());
|
||||||
|
}
|
||||||
|
|
||||||
rname.seekp(0); rclass.seekp(0);
|
rname.seekp(0); rclass.seekp(0);
|
||||||
rname << rscreen.str() << "opaqueMove" << ends;
|
rname << rscreen.str() << "opaqueMove" << ends;
|
||||||
|
|
Loading…
Reference in a new issue