From 3c2436cb71cf37fe4f12eb6b1ccbbe3393ade2b1 Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 28 Mar 2012 20:59:17 +0200
Subject: [PATCH] Bugfix: fallback when the image cannot be loaded
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If the specified file does not exist or is invalid, previously, the unlock
indicator wouldn’t show up at all, because the invalid surface was still used.

With this commit, i3lock will react like if you didn’t specify an image at all.
---
 i3lock.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/i3lock.c b/i3lock.c
index bda40a0..895d50a 100644
--- a/i3lock.c
+++ b/i3lock.c
@@ -688,6 +688,13 @@ int main(int argc, char *argv[]) {
     if (image_path) {
         /* Create a pixmap to render on, fill it with the background color */
         img = cairo_image_surface_create_from_png(image_path);
+        /* In case loading failed, we just pretend no -i was specified. */
+        if (cairo_surface_status(img) != CAIRO_STATUS_SUCCESS) {
+            if (debug_mode)
+                fprintf(stderr, "Could not load image \"%s\": cairo surface status %d\n",
+                        image_path, cairo_surface_status(img));
+            img = NULL;
+        }
     }
 #endif