Merge #2569

2569: Only call global_mock->XInitThreads() if global mock exists r=AlanGriffiths a=wmww Fixes #2568 Co-authored-by: Sophie Winter <wm@wmww.sh>
canonical · Aug 24, 2022 · dde3dba · dde3dba
2 parents 645b744 + 473c51b
commit dde3dba
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/tests/mir_test_doubles/mock_x11.cpp b/tests/mir_test_doubles/mock_x11.cpp
@@ -221,7 +221,14 @@ XErrorHandler XSetErrorHandler(XErrorHandler handler)
 
 Status XInitThreads()
 {
-    return global_mock->XInitThreads();
+    if (global_mock)
+    {
+        return global_mock->XInitThreads();
+    }
+    else
+    {
+        return 0;
+    }
 }
 
 int XSetWMHints(Display* display, Window window, XWMHints* wmhints)