From: Ray Strode <rstrode@redhat.com>
Date: Wed, 24 Oct 2012 19:40:48 +0000 (-0400)
Subject: two-step: reshow label after changing message
X-Git-Tag: 0.8.8~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=370c46d5d456c79ff573f7cb1fd3b25fb21a982c;p=thirdparty%2Fplymouth.git

two-step: reshow label after changing message

We should call ply_label_show any time we have a message
to show, so that if the root filesystem gets mounted, we
can try to load the label plugin again.

This should prevent weird situations where the text shows up
invisible unless the user hits escape twice.

http://bugs.freedesktop.org/show_bug.cgi?id=55669
---

diff --git a/src/plugins/splash/two-step/plugin.c b/src/plugins/splash/two-step/plugin.c
index 375d6f55..2998beb7 100644
--- a/src/plugins/splash/two-step/plugin.c
+++ b/src/plugins/splash/two-step/plugin.c
@@ -161,8 +161,6 @@ view_new (ply_boot_splash_plugin_t *plugin,
 
   view->label = ply_label_new ();
   view->message_label = ply_label_new ();
-  ply_label_set_text (view->message_label, "");
-  ply_label_show (view->message_label, view->display, 10, 10);
 
   return view;
 }
@@ -1249,6 +1247,7 @@ show_message (ply_boot_splash_plugin_t *plugin,
       next_node = ply_list_get_next_node (plugin->views, node);
       
       ply_label_set_text (view->message_label, message);
+      ply_label_show (view->message_label, view->display, 10, 10);
       
       ply_pixel_display_draw_area (view->display, 10, 10,
                                    ply_label_get_width (view->message_label),