summaryrefslogtreecommitdiffstats
path: root/sesman/session.c
diff options
context:
space:
mode:
authorjsorg71 <jsorg71>2006-02-05 19:09:44 +0000
committerjsorg71 <jsorg71>2006-02-05 19:09:44 +0000
commit285a1139c1d606bdad13eed30b87393b716b0be9 (patch)
treeea348692e927e022f5941c5bff97b647217b6bcd /sesman/session.c
parent59fc01e215e88d36ba533d514b8e907a27a824bc (diff)
downloadxrdp-proprietary-285a1139c1d606bdad13eed30b87393b716b0be9.tar.gz
xrdp-proprietary-285a1139c1d606bdad13eed30b87393b716b0be9.zip
check for lock file too when checking for X server running
Diffstat (limited to 'sesman/session.c')
-rw-r--r--sesman/session.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/sesman/session.c b/sesman/session.c
index 9b2965e1..afc3c4d2 100644
--- a/sesman/session.c
+++ b/sesman/session.c
@@ -82,9 +82,16 @@ static int DEFAULT_CC
x_server_running(int display)
{
char text[256];
+ int x_running;
g_sprintf(text, "/tmp/.X11-unix/X%d", display);
- return g_file_exist(text);
+ x_running = g_file_exist(text);
+ if (!x_running)
+ {
+ g_sprintf(text, "/tmp/.X%d-lock", display);
+ x_running = g_file_exist(text);
+ }
+ return x_running;
}
/******************************************************************************/