summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsimonb <simonb>2006-04-25 02:11:19 (GMT)
committersimonb <simonb>2006-04-25 02:11:19 (GMT)
commitfae88b329c63c16755f2c9b7a5a655a1414ab10f (patch)
tree23447b5d4bbaa6334dd7806b449f01e5d5411e71
parentacf4326f3cc3451aaf874b0b0777d69be5834e57 (diff)
downloadfluxbox_lack-fae88b329c63c16755f2c9b7a5a655a1414ab10f.zip
fluxbox_lack-fae88b329c63c16755f2c9b7a5a655a1414ab10f.tar.bz2
Output the error message on fallback restart execs (sf.net patch
#1475213). Thanks Jonas Koelker, jonaskoelker at users.sourceforge.net.
-rw-r--r--ChangeLog4
-rw-r--r--src/main.cc6
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3bad7b4..24faf6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.16: 2Changes for 0.9.16:
3*06/04/25:
4 * Output the error message on fallback restart execs (sf patch#1475213)
5 (Thanks Jonas Kölker, jonaskoelker at users.sourceforge.net).
6 main.cc
3*06/04/24: 7*06/04/24:
4 * Use -Wall when --enable-debug and some warning fixes 8 * Use -Wall when --enable-debug and some warning fixes
5 (Simon + thanks Jonas Koelker) 9 (Simon + thanks Jonas Koelker)
diff --git a/src/main.cc b/src/main.cc
index b458fbf..00bc163 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -312,7 +312,11 @@ int main(int argc, char **argv) {
312 312
313 // fall back in case the above execlp doesn't work 313 // fall back in case the above execlp doesn't work
314 execvp(argv[0], argv); 314 execvp(argv[0], argv);
315 execvp(FbTk::StringUtil::basename(argv[0]).c_str(), argv); 315 perror(argv[0]);
316
317 const char *basename = FbTk::StringUtil::basename(argv[0]).c_str();
318 execvp(basename, argv);
319 perror(basename);
316 } 320 }
317 321
318 return exitcode; 322 return exitcode;