Improved error handling

complexlogic · Feb 5, 2022 · a6e8643 · a6e8643
1 parent 8707680
commit a6e8643
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 13 deletions.
diff --git a/src/image.c b/src/image.c
@@ -111,17 +111,18 @@ SDL_Texture *load_texture_from_file(const char *path)
 {
   SDL_Surface *surface = NULL;
   SDL_Texture *texture = NULL;
-
-  surface = IMG_Load(path);
-  if (surface == NULL) {
-    output_log(LOGLEVEL_ERROR, 
-     "Error: Could not load image %s\n%s\n", 
-      path, 
-      IMG_GetError()
-    );
-  }
-  else {
-    texture = load_texture(surface);
+  if (path != NULL) {
+    surface = IMG_Load(path);
+    if (surface == NULL) {
+      output_log(LOGLEVEL_ERROR, 
+      "Error: Could not load image %s\n%s\n", 
+        path, 
+        IMG_GetError()
+      );
+    }
+    else {
+      texture = load_texture(surface);
+    }
   }
   return texture;
 }

diff --git a/src/launcher.c b/src/launcher.c
@@ -1142,7 +1142,12 @@ int main(int argc, char *argv[])
 
   // Render background
   if (config.background_mode == MODE_IMAGE) {
-    background_texture = load_texture_from_file(config.background_image);
+    if (config.background_image == NULL) {
+      output_log(LOGLEVEL_ERROR, "Error: BackgroundImage not specified in config file\n");
+    }
+    else {
+      background_texture = load_texture_from_file(config.background_image);
+    }
 
     // Switch to color mode if loading background image failed
     if (background_texture == NULL) {
@@ -1261,7 +1266,7 @@ int main(int argc, char *argv[])
           else if (event.window.event == SDL_WINDOWEVENT_LEAVE) {
             output_log(LOGLEVEL_DEBUG, "Lost mouse focus\n");
           }
-        break;
+          break;
       }
     }