From fd5d6ebe200177cb0447891dd445fbbf6ebac20e Mon Sep 17 00:00:00 2001
From: Maxime Graulich <maxime.graulich@gmail.com>
Date: Fri, 12 Dec 2014 18:27:30 +0000
Subject: [PATCH]
---
Common/GmshMessage.cpp | 2 +-
Fltk/Main.cpp | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/Common/GmshMessage.cpp b/Common/GmshMessage.cpp
index 6fd7a9493f..437d9a5ec4 100644
--- a/Common/GmshMessage.cpp
+++ b/Common/GmshMessage.cpp
@@ -797,7 +797,7 @@ public:
void Msg::InitializeOnelab(const std::string &name, const std::string &sockname)
{
-if defined(HAVE_ONELAB)
+#if defined(HAVE_ONELAB)
if(_onelabClient) delete _onelabClient;
if(sockname.empty()){
_onelabClient = new localGmsh();
diff --git a/Fltk/Main.cpp b/Fltk/Main.cpp
index bd4754f278..c8cba8e3f2 100644
--- a/Fltk/Main.cpp
+++ b/Fltk/Main.cpp
@@ -11,6 +11,9 @@
#include "Options.h"
#include "PluginManager.h"
#include "GModel.h"
+#if defined(__linux__) && !defined(BUILD_ANDROID)
+#include <X11/Xlib.h>
+#endif
int main(int argc, char *argv[])
{
@@ -38,5 +41,8 @@ int main(int argc, char *argv[])
}
// Interactive Gmsh with FLTK GUI
+#if defined(__linux__) && !defined(BUILD_ANDROID)
+ XInitThreads();
+#endif
return GmshFLTK(argc, argv);
}
--
GitLab