]> git.ipfire.org Git - thirdparty/plymouth.git/commitdiff
Revert "main: don't allow ESC key repeat to flood console"
authorRay Strode <rstrode@redhat.com>
Mon, 24 Apr 2017 20:16:47 +0000 (16:16 -0400)
committerRay Strode <rstrode@redhat.com>
Mon, 24 Apr 2017 20:16:47 +0000 (16:16 -0400)
This reverts commit 1f1d83bf71fc4d1748bed3366fd6a597d34fbabd.

src/main.c

index eeb4e20d4e695807c6250c57f25e666c9d7b3656..08c7fe1aad699a5c4b808df2f37e78346c9e15e7 100644 (file)
@@ -102,7 +102,6 @@ typedef struct
         ply_terminal_t         *local_console_terminal;
         ply_device_manager_t   *device_manager;
 
-        ply_trigger_t          *details_trigger;
         ply_trigger_t          *deactivate_trigger;
         ply_trigger_t          *quit_trigger;
 
@@ -1520,24 +1519,8 @@ toggle_between_splash_and_details (state_t *state)
 static void
 on_escape_pressed (state_t *state)
 {
-
-        if (state->details_trigger != NULL) {
-                return;
-        }
-
-        state->details_trigger = ply_trigger_new (&state->details_trigger);
-
-        ply_trigger_add_handler (state->details_trigger,
-                                 (ply_trigger_handler_t)
-                                 toggle_between_splash_details,
-                                 state);
-
         ply_trace ("escape key pressed");
-        ply_event_loop_watch_for_timeout (state->loop,
-                                          0.01,
-                                          (ply_event_loop_timeout_handler_t)
-                                          ply_trigger_pull
-                                          state->details_trigger);
+        toggle_between_splash_and_details (state);
 }
 
 static void