summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Heynig <Andreas.Heynig@meetwise.com>2020-01-22 19:36:57 +0100
committerDaniel Stone <daniels@collabora.com>2020-08-17 11:59:39 +0000
commit2592d6591efba9fb5d8f76fdbf5add02568d1eb8 (patch)
tree1f7657aff7baa2d13931bb77d8063c9cdaa4dad7
parent465ab2cd928eea47d8aae6d2e0acb21a87f62009 (diff)
libweston/launcher-direct.c: do not fail if already in graphics mode
In case of a crash tty remains in graphic mode. This change allows to restart weston without taking care of the actual tty mode. Signed-off-by: ahe <Andreas.Heynig@meetwise.com>
-rw-r--r--libweston/launcher-direct.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/libweston/launcher-direct.c b/libweston/launcher-direct.c
index 382ca49f..c20d70f2 100644
--- a/libweston/launcher-direct.c
+++ b/libweston/launcher-direct.c
@@ -160,7 +160,6 @@ setup_tty(struct launcher_direct *launcher, int tty)
if (kd_mode != KD_TEXT) {
weston_log("%s is already in graphics mode, "
"is another display server running?\n", tty_device);
- goto err_close;
}
ioctl(launcher->tty, VT_ACTIVATE, minor(buf.st_rdev));