From: Ray Strode <rstrode@redhat.com>
Date: Wed, 5 Nov 2008 19:09:26 +0000 (-0500)
Subject: Reset colors and show text cursor on remove_window
X-Git-Tag: 0.6.0~41^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b02dba2d0419a3c81348e510c51f5c20f82eadad;p=thirdparty%2Fplymouth.git

Reset colors and show text cursor on remove_window

Now that we retain the splash on screen and don't
explicitly hide it on quit, we need to make sure
that we leave the window as we found it when we
remove the window from the splash.
---

diff --git a/src/plugins/splash/pulser/plugin.c b/src/plugins/splash/pulser/plugin.c
index 089edb9d..fcf6ee5b 100644
--- a/src/plugins/splash/pulser/plugin.c
+++ b/src/plugins/splash/pulser/plugin.c
@@ -228,6 +228,9 @@ void
 remove_window (ply_boot_splash_plugin_t *plugin,
                ply_window_t             *window)
 {
+  ply_window_show_text_cursor (plugin->window);
+  ply_window_reset_colors (plugin->window);
+
   plugin->window = NULL;
 }
 
@@ -308,8 +311,6 @@ hide_splash_screen (ply_boot_splash_plugin_t *plugin,
 
       ply_window_set_background_color (plugin->window, PLY_WINDOW_COLOR_DEFAULT);
       ply_window_clear_screen (plugin->window);
-      ply_window_show_text_cursor (plugin->window);
-      ply_window_reset_colors (plugin->window);
     }
 }
 
diff --git a/src/plugins/splash/text/plugin.c b/src/plugins/splash/text/plugin.c
index 500ca912..a27abc61 100644
--- a/src/plugins/splash/text/plugin.c
+++ b/src/plugins/splash/text/plugin.c
@@ -234,6 +234,9 @@ void
 remove_window (ply_boot_splash_plugin_t *plugin,
                ply_window_t             *window)
 {
+  ply_window_show_text_cursor (plugin->window);
+  ply_window_reset_colors (plugin->window);
+
   plugin->window = NULL;
 }
 
@@ -333,8 +336,6 @@ hide_splash_screen (ply_boot_splash_plugin_t *plugin,
 
       ply_window_set_background_color (plugin->window, PLY_WINDOW_COLOR_DEFAULT);
       ply_window_clear_screen (plugin->window);
-      ply_window_show_text_cursor (plugin->window);
-      ply_window_reset_colors (plugin->window);
     }
 }