[PATCH 10/20] [main] call deactivate_splash() even when no splash
Scott James Remnant
scott at ubuntu.com
Thu Mar 18 13:40:58 PDT 2010
To allow deactivate_splash() to do more than affect the boot splash
plugin and renderer, call it from the deactivate path when there is
no boot splash screen as well.
---
src/main.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main.c b/src/main.c
index c320842..4b06309 100644
--- a/src/main.c
+++ b/src/main.c
@@ -735,9 +735,10 @@ deactivate_splash (state_t *state)
ply_trace ("quitting splash");
quit_splash (state);
+ state->is_inactive = true;
+
ply_trigger_pull (state->deactivate_trigger, NULL);
state->deactivate_trigger = NULL;
- state->is_inactive = true;
}
static void
@@ -792,8 +793,8 @@ on_deactivate (state_t *state,
}
else
{
- ply_trigger_pull (state->deactivate_trigger, NULL);
- state->deactivate_trigger = NULL;
+ ply_trace ("deactivating splash");
+ deactivate_splash (state);
}
}
--
1.7.0
More information about the plymouth
mailing list