summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Strode <halfline@gmail.com>2022-11-29 14:26:18 +0000
committerRay Strode <halfline@gmail.com>2022-11-29 14:26:18 +0000
commit6b28bb622917ed3e640714b64ecdc121385913fa (patch)
treea29c7a758fe6c6b65579c95bf43380b5ec647b37
parent605b038acb3188f97cca557c18a38443038224dc (diff)
parent03d4e91bcdd1f430a1c0ce539536a7c7a3f3e31c (diff)
Merge branch 'fix-novt-input' into 'main'
renderers: No longer assume that input is closed if the terminal device is NULL. See merge request plymouth/plymouth!214
-rw-r--r--src/plugins/renderers/drm/plugin.c3
-rw-r--r--src/plugins/renderers/frame-buffer/plugin.c3
2 files changed, 0 insertions, 6 deletions
diff --git a/src/plugins/renderers/drm/plugin.c b/src/plugins/renderers/drm/plugin.c
index 56c9f898..9a04a8f5 100644
--- a/src/plugins/renderers/drm/plugin.c
+++ b/src/plugins/renderers/drm/plugin.c
@@ -1847,9 +1847,6 @@ open_input_source (ply_renderer_backend_t *backend,
if (!backend->input_source_is_open)
watch_input_devices (backend);
- if (backend->terminal == NULL)
- return false;
-
if (backend->terminal != NULL) {
terminal_fd = ply_terminal_get_fd (backend->terminal);
diff --git a/src/plugins/renderers/frame-buffer/plugin.c b/src/plugins/renderers/frame-buffer/plugin.c
index 2ff76b43..553a4107 100644
--- a/src/plugins/renderers/frame-buffer/plugin.c
+++ b/src/plugins/renderers/frame-buffer/plugin.c
@@ -752,9 +752,6 @@ open_input_source (ply_renderer_backend_t *backend,
if (!backend->input_source_is_open)
watch_input_devices (backend);
- if (backend->terminal == NULL)
- return false;
-
if (backend->terminal != NULL) {
terminal_fd = ply_terminal_get_fd (backend->terminal);