From e0e96977b348772cac67282a6591d6c58eeaa927 Mon Sep 17 00:00:00 2001 From: Bert Münnich Date: Wed, 28 Oct 2015 20:59:48 +0100 Subject: Removed overcautious parameter checks --- main.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'main.c') diff --git a/main.c b/main.c index 179dcc0..f5b5158 100644 --- a/main.c +++ b/main.c @@ -117,7 +117,7 @@ void check_add_file(char *filename, bool given) { const char *bn; - if (filename == NULL || *filename == '\0') + if (*filename == '\0') return; if (access(filename, R_OK) < 0) { @@ -323,7 +323,8 @@ void load_image(int new) if (new < 0 || new >= filecnt) return; - win_set_cursor(&win, CURSOR_WATCH); + if (win.xwin != None) + win_set_cursor(&win, CURSOR_WATCH); reset_timeout(slideshow); if (new != current) @@ -590,9 +591,6 @@ void on_keypress(XKeyEvent *kev) char key; bool dirty = false; - if (kev == NULL) - return; - if (kev->state & ShiftMask) { kev->state &= ~ShiftMask; XLookupString(kev, &key, 1, &shksym, NULL); @@ -633,9 +631,6 @@ void on_buttonpress(XButtonEvent *bev) bool dirty = false; static Time firstclick; - if (bev == NULL) - return; - if (mode == MODE_IMAGE) { win_set_cursor(&win, CURSOR_ARROW); set_timeout(reset_cursor, TO_CURSOR_HIDE, true); -- cgit v1.2.3-54-g00ecf