Blob Blame History Raw
From 3d53c471d7f8c477c46a1251100dd998e2609472 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Tue, 6 Oct 2009 15:30:33 -0400
Subject: [PATCH 1/2] [drm] don't close terminal

It belongs to the core daemon, not the plugin.
---
 src/plugins/renderers/drm/plugin.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/src/plugins/renderers/drm/plugin.c b/src/plugins/renderers/drm/plugin.c
index 34aa8f8..d317e2a 100644
--- a/src/plugins/renderers/drm/plugin.c
+++ b/src/plugins/renderers/drm/plugin.c
@@ -487,7 +487,6 @@ open_device (ply_renderer_backend_t *backend)
 static void
 close_device (ply_renderer_backend_t *backend)
 {
-  ply_terminal_close (backend->terminal);
   free_heads (backend);
 
   ply_console_stop_watching_for_active_vt_change (backend->console,
-- 
1.6.5.rc2


From 4c777de9fc17cb4b8ab454b26e2ece646c4829c9 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Tue, 6 Oct 2009 15:31:53 -0400
Subject: [PATCH 2/2] [renderer] close device on failures

Before we were just unloading the module without
closing it.
---
 src/libplybootsplash/ply-renderer.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/libplybootsplash/ply-renderer.c b/src/libplybootsplash/ply-renderer.c
index 08a246b..f7f3c90 100644
--- a/src/libplybootsplash/ply-renderer.c
+++ b/src/libplybootsplash/ply-renderer.c
@@ -247,6 +247,7 @@ ply_renderer_open (ply_renderer_t *renderer)
         {
           ply_trace ("could not query rendering device for plugin %s",
                      plugin_path);
+          ply_renderer_close_device (renderer);
           ply_renderer_unload_plugin (renderer);
           continue;
         }
@@ -255,6 +256,7 @@ ply_renderer_open (ply_renderer_t *renderer)
         {
           ply_trace ("could not map renderer to device for plugin %s",
                      plugin_path);
+          ply_renderer_close_device (renderer);
           ply_renderer_unload_plugin (renderer);
           continue;
         }
-- 
1.6.5.rc2