From 237d2ad6d625eec44c6c355a5e9348194775faab Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Fri, 8 Aug 2008 16:06:32 -0400 Subject: [PATCH] don't assume vt1 and instead use current tty --- src/main.c | 8 ++++++-- src/splash-plugins/text/plugin.c | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main.c b/src/main.c index c80af3ff..a7488a5d 100644 --- a/src/main.c +++ b/src/main.c @@ -156,7 +156,11 @@ on_newroot (state_t *state, static void on_system_initialized (state_t *state) { - ply_trace ("system now initialized, opening boot.log"); + ply_trace ("system now initialized"); + if (state->session == NULL) + return; + + ply_trace ("opening boot log"); ply_terminal_session_open_log (state->session, PLYMOUTH_LOG_DIRECTORY "/boot.log"); } @@ -199,7 +203,7 @@ on_show_splash (state_t *state) if (state->window == NULL) { - state->window = create_window (state, 1); + state->window = create_window (state, 0); ply_window_take_console (state->window); } diff --git a/src/splash-plugins/text/plugin.c b/src/splash-plugins/text/plugin.c index d5c011bb..bf29e965 100644 --- a/src/splash-plugins/text/plugin.c +++ b/src/splash-plugins/text/plugin.c @@ -136,6 +136,7 @@ stop_animation (ply_boot_splash_plugin_t *plugin) assert (plugin->loop != NULL); ply_text_pulser_stop (plugin->pulser); + ply_window_reset_colors (plugin->window); } static void @@ -273,7 +274,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); plugin->window = NULL; } -- 2.47.2