summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDennis Real <github@tildepipe.org>2012-03-25 19:07:30 +0200
committerDennis Real <github@tildepipe.org>2012-03-25 19:07:30 +0200
commitcf6f0320c15abd753951990a963d5c94b180bbde (patch)
tree3e03e4d38bd9352cfb438a0e1de6080df78995af /src
parent10b7b1e3e10ba650b240a742947cb6850bbadd23 (diff)
parent877e6346d5512c44b9c27f4809c0742766eadac2 (diff)
Merge branch 'master' of git://github.com/derf/feh
Diffstat (limited to 'src')
-rw-r--r--src/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.c b/src/main.c
index e6239e1..6634a88 100644
--- a/src/main.c
+++ b/src/main.c
@@ -41,10 +41,10 @@ int main(int argc, char **argv)
{
atexit(feh_clean_exit);
+ setup_signal_handlers();
init_parse_options(argc, argv);
init_imlib_fonts();
- setup_signal_handlers();
if (opt.display) {
init_x_and_imlib();