diff options
| author | Tony Crisci <tony@dubstepdish.com> | 2018-01-21 15:09:33 -0500 |
|---|---|---|
| committer | Tony Crisci <tony@dubstepdish.com> | 2018-01-21 15:09:33 -0500 |
| commit | 7474f005917fbb98cad08e8078c1da0c27742174 (patch) | |
| tree | 276559dbe3c24ecc6626258132666ae736427a36 /backend/session | |
| parent | 61bd79200cc3892b143b7321886db77e97c9f69f (diff) | |
| parent | 79f2c8719364529056229b99bf9e49a994699fe7 (diff) | |
Merge branch 'master' into decorations
Diffstat (limited to 'backend/session')
| -rw-r--r-- | backend/session/logind.c | 4 | ||||
| -rw-r--r-- | backend/session/session.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/backend/session/logind.c b/backend/session/logind.c index 0b5b2a63..1ece051f 100644 --- a/backend/session/logind.c +++ b/backend/session/logind.c @@ -330,7 +330,9 @@ static bool add_signal_matches(struct logind_session *session) { static int dbus_event(int fd, uint32_t mask, void *data) { sd_bus *bus = data; - while (sd_bus_process(bus, NULL) > 0); + while (sd_bus_process(bus, NULL) > 0) { + // Do nothing. + } return 1; } diff --git a/backend/session/session.c b/backend/session/session.c index a5f17b8d..2bbbd4ef 100644 --- a/backend/session/session.c +++ b/backend/session/session.c @@ -307,8 +307,9 @@ size_t wlr_session_find_gpus(struct wlr_session *session, } const char *seat = udev_device_get_property_value(dev, "ID_SEAT"); - if (!seat) + if (!seat) { seat = "seat0"; + } if (session->seat[0] && strcmp(session->seat, seat) != 0) { udev_device_unref(dev); continue; |