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 089edb9dee519f7531c2090b3ec1886d25f2dd56..fcf6ee5bf0bbbe0d1084938c394521e7afc0e1bd 100644 (file)
--- 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 500ca9126cc7d3ac04dcfbe81fdb85da96dcc2bc..a27abc61acf8a0cf0655a9db78dffda6b6484afb 100644 (file)
--- 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);
     }
 }