fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-06-06 22:18:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'issue-1139' into 'main'

Browse source 
Draft: os: Always create lock file on explicit display

See merge request xorg/xserver!614
This commit is contained in:
Olivier Certner 2026-06-02 11:07:23 +00:00
commit e2eb479278
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
os/utils.c
View file

@ -264,7 +264,7 @@ LockServer(void)
int len;
char port[20];
if (nolock || NoListenAll)
if (nolock || NoListenAll || (displayfd != -1 && !explicit_display))
return;
/*
* Path names
@ -391,7 +391,7 @@ LockServer(void)
void
UnlockServer(void)
{
if (nolock || NoListenAll)
if (nolock || NoListenAll || (displayfd != -1 && !explicit_display))
return;
if (!StillLocking) {
@ -764,9 +764,6 @@ ProcessCommandLine(int argc, char *argv[])
else if (strcmp(argv[i], "-displayfd") == 0) {
if (++i < argc) {
displayfd = atoi(argv[i]);
#ifdef LOCK_SERVER
nolock = TRUE;
#endif
}
else
UseMsg();