evdev_device_set_output(struct evdev_device *device,
struct weston_output *output)
{
+ if (device->output_destroy_listener.notify) {
+ wl_list_remove(&device->output_destroy_listener.link);
+ device->output_destroy_listener.notify = NULL;
+ }
+
device->output = output;
device->output_destroy_listener.notify = notify_output_destroy;
wl_signal_add(&output->destroy_signal,
evdev_device_set_output(struct evdev_device *device,
struct weston_output *output)
{
+ if (device->output_destroy_listener.notify) {
+ wl_list_remove(&device->output_destroy_listener.link);
+ device->output_destroy_listener.notify = NULL;
+ }
+
device->output = output;
device->output_destroy_listener.notify = notify_output_destroy;
wl_signal_add(&output->destroy_signal,
wl_list_for_each(output, &c->output_list, link)
if (strcmp(output->name, device->output_name) == 0)
evdev_device_set_output(device, output);
- } else if (device->output == NULL) {
+ }
+
+ if (device->output == NULL) {
output = container_of(c->output_list.next,
struct weston_output, link);
evdev_device_set_output(device, output);
wl_list_for_each(output, &c->output_list, link)
if (strcmp(output->name, device->output_name) == 0)
evdev_device_set_output(device, output);
- } else if (device->output == NULL) {
+ }
+
+ if (device->output == NULL) {
output = container_of(c->output_list.next,
struct weston_output, link);
evdev_device_set_output(device, output);