logind: Remove missing 'else'
authorKristian Høgsberg <krh@bitplanet.net>
Tue, 22 Oct 2013 20:19:23 +0000 (13:19 -0700)
committerKristian Høgsberg <krh@bitplanet.net>
Tue, 22 Oct 2013 20:19:23 +0000 (13:19 -0700)
Only fall through to cleaning up weston-launch or standalone state
if we didn't use logind.

src/launcher-util.c

index a1ff832..a599686 100644 (file)
@@ -409,9 +409,9 @@ weston_launcher_connect(struct weston_compositor *compositor, int tty,
 void
 weston_launcher_destroy(struct weston_launcher *launcher)
 {
-       if (launcher->logind)
+       if (launcher->logind) {
                weston_logind_destroy(launcher->logind);
-       if (launcher->fd != -1) {
+       } else if (launcher->fd != -1) {
                close(launcher->fd);
                wl_event_source_remove(launcher->source);
        } else {