nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bugfix: std::string() does not like NULL on construction

Browse source 
not having DISPLAY set (eg: on a headless system) caused fluxbox to crash.
This commit is contained in:
Mathias Gumz 2010-10-13 15:48:29 +02:00
parent 650b6f842b
commit e2d52a3948
1 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/main.cc
View file

@ -216,14 +216,23 @@ static void showInfo(ostream &ostr) {
}
struct Options {
Options() :
session_display(getenv("DISPLAY")),
rc_path(std::string(getenv("HOME")) + "/." + realProgramName("fluxbox")),
rc_file(rc_path + "/init"),
xsync(false) {
Options() : xsync(false) {
const char* env;
env = getenv("DISPLAY");
if (env) {
session_display.assign(env);
}
env = getenv("HOME");
if (env) {
rc_path.assign(std::string(env) + "/." + realProgramName("fluxbox"));
rc_file = rc_path + "/init";
}
}
std::string session_display;
std::string rc_path;
std::string rc_file;
@ -394,7 +403,11 @@ void updateConfigFilesIfNeeded(const std::string& rc_file) {
string commandargs = realProgramName("fluxbox-update_configs");
commandargs += " -rc " + rc_file;
system(commandargs.c_str());
if (system(commandargs.c_str())) {
fbdbg << "running '"
<< commandargs
<< "' failed." << endl;
}
}
}