diff options
author | markt <markt> | 2006-06-29 00:03:43 (GMT) |
---|---|---|
committer | markt <markt> | 2006-06-29 00:03:43 (GMT) |
commit | 1ddd177d1ab25503d18b94dc458de409de08095d (patch) | |
tree | 1f02ee860e1b5236cdb7081266047ccd7004f4f2 | |
parent | aad6845c91affaff2abb27fb23b301db7ddbbc1e (diff) | |
download | fluxbox_paul-1ddd177d1ab25503d18b94dc458de409de08095d.zip fluxbox_paul-1ddd177d1ab25503d18b94dc458de409de08095d.tar.bz2 |
Fix fbsetroot segfault when DISPLAY unset
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | util/fbsetroot.cc | 10 |
2 files changed, 10 insertions, 3 deletions
@@ -1,5 +1,8 @@ | |||
1 | (Format: Year/Month/Day) | 1 | (Format: Year/Month/Day) |
2 | Changes for 1.0rc2: | 2 | Changes for 1.0rc2: |
3 | *06/06/29: | ||
4 | * Fix fbsetroot segfault when DISPLAY is unset (Mark) | ||
5 | util/fbsetroot.cc | ||
3 | *06/06/28: | 6 | *06/06/28: |
4 | * Linear cycling wasn't affecting normal cycling order (Mark) | 7 | * Linear cycling wasn't affecting normal cycling order (Mark) |
5 | WorkspaceCmd.cc | 8 | WorkspaceCmd.cc |
diff --git a/util/fbsetroot.cc b/util/fbsetroot.cc index 842e183..24d8c50 100644 --- a/util/fbsetroot.cc +++ b/util/fbsetroot.cc | |||
@@ -419,8 +419,12 @@ int main(int argc, char **argv) { | |||
419 | display_name = argv[i]; | 419 | display_name = argv[i]; |
420 | } | 420 | } |
421 | } | 421 | } |
422 | 422 | ||
423 | fbsetroot app(argc, argv, display_name); | 423 | try { |
424 | 424 | fbsetroot app(argc, argv, display_name); | |
425 | } catch (std::string error_str) { | ||
426 | cerr<<_FB_CONSOLETEXT(Common, Error, "Error", "Error message header")<<": "<<error_str<<endl; | ||
427 | } | ||
428 | |||
425 | return (0); | 429 | return (0); |
426 | } | 430 | } |