From 6e9e95dc0fe89a3c52f50e44ff0096a6e65e46a6 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Wed, 20 Dec 2017 10:49:19 -0500
Subject: [PATCH] device-manager: drop superfluous
 create_pixel_displays_for_renderer call

commit 29e27637694eefc962d53333c729e6cac1c66518 tried to move
create_pixel_displays_for_renderer down a couple of lines, but it
inadvertently copied it instead of moved it.

This commit fixes that.

https://bugs.freedesktop.org/show_bug.cgi?id=104353
---
 src/libply-splash-core/ply-device-manager.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/libply-splash-core/ply-device-manager.c b/src/libply-splash-core/ply-device-manager.c
index cf56f4e..fbf4723 100644
--- a/src/libply-splash-core/ply-device-manager.c
+++ b/src/libply-splash-core/ply-device-manager.c
@@ -686,61 +686,60 @@ create_devices_for_terminal_and_renderer_type (ply_device_manager_t *manager,
                         ply_trace ("could not open renderer for %s", device_path);
                         ply_renderer_free (renderer);
                         renderer = NULL;
 
                         if (renderer_type != PLY_RENDERER_TYPE_AUTO)
                                 return false;
                 }
 
                 if (renderer != NULL) {
                         old_renderer = ply_hashtable_lookup (manager->renderers,
                                                              (void *) ply_renderer_get_device_name (renderer));
 
                         if (old_renderer != NULL) {
                                 ply_trace ("ignoring device %s since it's alerady managed",
                                            ply_renderer_get_device_name (renderer));
                                 ply_renderer_free (renderer);
 
                                 renderer = NULL;
                                 return;
                         }
                 }
         }
 
         if (renderer != NULL) {
                 keyboard = ply_keyboard_new_for_renderer (renderer);
                 ply_list_append_data (manager->keyboards, keyboard);
 
                 if (manager->keyboard_added_handler != NULL)
                         manager->keyboard_added_handler (manager->event_handler_data, keyboard);
 
-                create_pixel_displays_for_renderer (manager, renderer);
                 ply_hashtable_insert (manager->renderers, strdup (ply_renderer_get_device_name (renderer)), renderer);
                 create_pixel_displays_for_renderer (manager, renderer);
 
                 if (manager->renderers_activated) {
                         ply_trace ("activating renderer");
                         ply_renderer_activate (renderer);
                 }
 
                 if (terminal != NULL)
                         ply_terminal_refresh_geometry (terminal);
         } else if (terminal != NULL) {
                 keyboard = ply_keyboard_new_for_terminal (terminal);
                 ply_list_append_data (manager->keyboards, keyboard);
 
                 if (manager->keyboard_added_handler != NULL)
                         manager->keyboard_added_handler (manager->event_handler_data, keyboard);
         }
 
         if (terminal != NULL) {
                 create_text_displays_for_terminal (manager, terminal);
 
                 if (terminal == manager->local_console_terminal) {
                         manager->local_console_is_text = renderer == NULL;
                         manager->local_console_managed = true;
                 }
         }
 
         if (keyboard != NULL && manager->keyboards_activated) {
                 ply_trace ("activating keyboards");
                 ply_keyboard_watch_for_input (keyboard);
-- 
2.14.3