From: Ray Strode <rstrode@redhat.com>
Date: Wed, 23 Mar 2011 16:04:05 +0000 (-0400)
Subject: progress-animation: fail load if there are no frames
X-Git-Tag: 0.8.4~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e76f71ca479ae2ffe871eeaf2bd24fcd9f000c7;p=thirdparty%2Fplymouth.git

progress-animation: fail load if there are no frames

If there are no progress animation frames we need to
fail from the load function so plugins can deal with it
gracefully..
---

diff --git a/src/libply-splash-graphics/ply-progress-animation.c b/src/libply-splash-graphics/ply-progress-animation.c
index 079fe27d..00569ecf 100644
--- a/src/libply-splash-graphics/ply-progress-animation.c
+++ b/src/libply-splash-graphics/ply-progress-animation.c
@@ -347,6 +347,7 @@ ply_progress_animation_add_frames (ply_progress_animation_t *progress_animation)
 {
   struct dirent **entries;
   int number_of_entries;
+  int number_of_frames;
   int i;
   bool load_finished;
 
@@ -380,7 +381,18 @@ ply_progress_animation_add_frames (ply_progress_animation_t *progress_animation)
       free (entries[i]);
       entries[i] = NULL;
     }
-  load_finished = true;
+
+  number_of_frames = ply_array_get_size (progress_animation->frames);
+  if (number_of_frames == 0)
+    {
+      ply_trace ("could not find any progress animation frames");
+      load_finished = false;
+    }
+  else
+    {
+      ply_trace ("found %d progress animation frames", number_of_frames);
+      load_finished = true;
+    }
 
 out:
   if (!load_finished)