[main] deactivate renderer before hiding

If we don't deactivate the renderer before hiding the splash, the
drm renderer may scan out the buffer contents to the fbcon buffer;
since we only hide the splash when dumping details or when
--retain-splash is *not* given to quit, this is exactly the
opposite of what we want.

The effect of not doing this is partial splash contents behind the
details in cases of error, or when using quit.  This doesn't affect
plymouth quit --retain-splash.

diff --git a/src/main.c b/src/main.c
index 337afa6592e9eefb07ed49072626c4fa1992b053..df24e5941f3c121cfc05f6cadcda7580bdd3c500 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -659,6 +659,8 @@ dump_details_and_quit_splash (state_t *state)
   state->showing_details = false;
   on_escape_pressed (state);
 
+  if (state->renderer != NULL)
+    ply_renderer_deactivate (state->renderer);
   if (state->boot_splash != NULL)
     ply_boot_splash_hide (state->boot_splash);
 
@@ -773,6 +775,8 @@ on_boot_splash_idle (state_t *state)
       if (!state->should_retain_splash)
         {
           ply_trace ("hiding splash");
+          if (state->renderer != NULL)
+            ply_renderer_deactivate (state->renderer);
           if (state->boot_splash != NULL)
             ply_boot_splash_hide (state->boot_splash);
         }