X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Flogind-seat.c;h=126c5b84cc5b4f4ade8dddfb53174c635ddb6754;hb=1433efd219a6df414a1821b3d3d70d86201ed3e4;hp=04909a991a5f1a0de020b09e863ffdc065582ec3;hpb=0a1beeb64207eaa88ab9236787b1cbc2f704ae14;p=elogind.git

diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c
index 04909a991..126c5b84c 100644
--- a/src/login/logind-seat.c
+++ b/src/login/logind-seat.c
@@ -154,7 +154,7 @@ int seat_save(Seat *s) {
 
 finish:
         if (r < 0)
-                log_error_errno(-r, "Failed to save seat data %s: %m", s->state_file);
+                log_error_errno(r, "Failed to save seat data %s: %m", s->state_file);
 
         return r;
 }
@@ -201,7 +201,7 @@ int seat_preallocate_vts(Seat *s) {
 
                 q = vt_allocate(i);
                 if (q < 0) {
-                        log_error_errno(-q, "Failed to preallocate VT %i: %m", i);
+                        log_error_errno(q, "Failed to preallocate VT %u: %m", i);
                         r = q;
                 }
         }
@@ -221,7 +221,7 @@ int seat_apply_acls(Seat *s, Session *old_active) {
                             !!s->active, s->active ? s->active->user->uid : 0);
 
         if (r < 0)
-                log_error_errno(-r, "Failed to apply ACLs: %m");
+                log_error_errno(r, "Failed to apply ACLs: %m");
 
         return r;
 }
@@ -340,12 +340,24 @@ int seat_active_vt_changed(Seat *s, unsigned int vtnr) {
 
         log_debug("VT changed to %u", vtnr);
 
+        /* we might have earlier closing sessions on the same VT, so try to
+         * find a running one first */
         LIST_FOREACH(sessions_by_seat, i, s->sessions)
-                if (i->vtnr == vtnr) {
+                if (i->vtnr == vtnr && !i->stopping) {
                         new_active = i;
                         break;
                 }
 
+        if (!new_active) {
+                /* no running one? then we can't decide which one is the
+                 * active one, let the first one win */
+                LIST_FOREACH(sessions_by_seat, i, s->sessions)
+                        if (i->vtnr == vtnr) {
+                                new_active = i;
+                                break;
+                        }
+        }
+
         r = seat_set_active(s, new_active);
         manager_spawn_autovt(s->manager, vtnr);