summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Turney <jon.turney@dronecode.org.uk>2019-03-15 16:12:19 +0000
committerJon Turney <jon.turney@dronecode.org.uk>2019-03-15 16:12:19 +0000
commit3d16333cbf14ffadf0c069f4bcd426d3be610782 (patch)
treed81692b77272cd2d6b1cd0394d23b29954a8a4db
parent7d0f997a4b8e1b62c9b82e9b10934a6c55a6eb48 (diff)
Fix '-silent-dup-error -nolock'
-rw-r--r--hw/xwin/winerror.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/xwin/winerror.c b/hw/xwin/winerror.c
index 1191d27b8..e688ca22e 100644
--- a/hw/xwin/winerror.c
+++ b/hw/xwin/winerror.c
@@ -70,7 +70,8 @@ OsVendorFatalError(const char *f, va_list args)
if (g_fSilentDupError) {
if ((strcmp(f, "InitOutput - Duplicate invocation on display number: %s. Exiting.\n") == 0)
|| (strcmp(f, "Server is already active for display %s\n%s %s\n%s\n") == 0)
- || (strcmp(f, "MakeAllCOTSServerListeners: server already running\n") == 0)) {
+ || (strcmp(f, "Cannot establish any listening sockets - Make sure an X server isn't already running") == 0)
+ || (strcmp(f, "_XSERVTransMakeAllCOTSServerListeners: server already running\n") == 0)) {
g_fSilentFatalError = TRUE;
}
}