respond w/ "" if user hits esc to password prompt

This is so when we load the next plugin it won't
get confused.

diff --git a/src/plugins/splash/details/plugin.c b/src/plugins/splash/details/plugin.c
index 50e13abe8f9c82c598e18d0cad54c2f4c4cd6ceb..3706e81f4b32e5ad50869435f2b29c6d813d8319 100644 (file)
--- a/src/plugins/splash/details/plugin.c
+++ b/src/plugins/splash/details/plugin.c
@@ -205,6 +205,12 @@ hide_splash_screen (ply_boot_splash_plugin_t *plugin,
 
   ply_trace ("hiding splash screen");
 
+  if (plugin->pending_password_answer != NULL)
+    {
+      ply_answer_with_string (plugin->pending_password_answer, "");
+      plugin->pending_password_answer = NULL;
+    }
+
   ply_window_set_keyboard_input_handler (window, NULL, NULL);
   ply_window_set_backspace_handler (window, NULL, NULL);
   ply_window_set_enter_handler (window, NULL, NULL);

diff --git a/src/plugins/splash/fade-in/plugin.c b/src/plugins/splash/fade-in/plugin.c
index 2641217e3f68c7b5134d98de1beb1abfe514aab8..604c1814e69e1b454eef3730e68f6a46ae79dbd9 100644 (file)
--- a/src/plugins/splash/fade-in/plugin.c
+++ b/src/plugins/splash/fade-in/plugin.c
@@ -578,6 +578,12 @@ hide_splash_screen (ply_boot_splash_plugin_t *plugin,
 {
   assert (plugin != NULL);
 
+  if (plugin->pending_password_answer != NULL)
+    {
+      ply_answer_with_string (plugin->pending_password_answer, "");
+      plugin->pending_password_answer = NULL;
+    }
+
   ply_window_set_keyboard_input_handler (window, NULL, NULL);
   ply_window_set_backspace_handler (window, NULL, NULL);
   ply_window_set_enter_handler (window, NULL, NULL);

diff --git a/src/plugins/splash/spinfinity/plugin.c b/src/plugins/splash/spinfinity/plugin.c
index 44d66cf35b432b4ce45c80408bb901c73557ad70..cd9a85b033a14438e8cc73fb37d15c8a7a01d6c7 100644 (file)
--- a/src/plugins/splash/spinfinity/plugin.c
+++ b/src/plugins/splash/spinfinity/plugin.c
@@ -387,6 +387,12 @@ hide_splash_screen (ply_boot_splash_plugin_t *plugin,
 {
   assert (plugin != NULL);
 
+  if (plugin->pending_password_answer != NULL)
+    {
+      ply_answer_with_string (plugin->pending_password_answer, "");
+      plugin->pending_password_answer = NULL;
+    }
+
   ply_window_set_keyboard_input_handler (window, NULL, NULL);
   ply_window_set_backspace_handler (window, NULL, NULL);
   ply_window_set_enter_handler (window, NULL, NULL);

diff --git a/src/plugins/splash/text/plugin.c b/src/plugins/splash/text/plugin.c
index 11c2dc4d4290b1bebf986743bebd75a9686d6ac5..465d7634e79041d5136ab381d5de0a57cdc8f46f 100644 (file)
--- a/src/plugins/splash/text/plugin.c
+++ b/src/plugins/splash/text/plugin.c
@@ -253,6 +253,12 @@ hide_splash_screen (ply_boot_splash_plugin_t *plugin,
 
   ply_trace ("hiding splash screen");
 
+  if (plugin->pending_password_answer != NULL)
+    {
+      ply_answer_with_string (plugin->pending_password_answer, "");
+      plugin->pending_password_answer = NULL;
+    }
+
   ply_window_set_keyboard_input_handler (window, NULL, NULL);
   ply_window_set_backspace_handler (window, NULL, NULL);
   ply_window_set_enter_handler (window, NULL, NULL);