From: Ray Strode <rstrode@redhat.com>
Date: Tue, 20 May 2008 14:53:09 +0000 (-0400)
Subject: disconnect from event loop in fedora-fade-in if show fails
X-Git-Tag: 0.1.0~99
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ed10c8ed910b9704d5ae434249578c8bf711702;p=thirdparty%2Fplymouth.git

disconnect from event loop in fedora-fade-in if show fails

We really need to drop attach_to_event_loop and pass the
loop into show.
---

diff --git a/src/splash-plugins/fedora-fade-in/fedora-fade-in.c b/src/splash-plugins/fedora-fade-in/fedora-fade-in.c
index 35021708..eb014f3d 100644
--- a/src/splash-plugins/fedora-fade-in/fedora-fade-in.c
+++ b/src/splash-plugins/fedora-fade-in/fedora-fade-in.c
@@ -138,6 +138,8 @@ free_stars (ply_boot_splash_plugin_t *plugin)
   plugin->stars = NULL;
 }
 
+static void detach_from_event_loop (ply_boot_splash_plugin_t *plugin);
+
 void
 destroy_plugin (ply_boot_splash_plugin_t *plugin)
 {
@@ -338,7 +340,12 @@ show_splash_screen (ply_boot_splash_plugin_t *plugin,
 
   ply_trace ("opening frame buffer");
   if (!ply_frame_buffer_open (plugin->frame_buffer))
-    return false;
+    {
+      ply_event_loop_stop_watching_for_exit (plugin->loop, (ply_event_loop_exit_handler_t)
+                                             detach_from_event_loop,
+                                             plugin);
+      return false;
+    }
 
   plugin->window = window;