From c7b27b4a06054594404c1d01615d76ecdc915fa6 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Wed, 1 Dec 2021 11:20:04 +0100 Subject: [PATCH] GMSHPLUGIN: patch --- products/GMSHPLUGIN.pyconf | 2 +- products/patches/GMSHPlugin_Mesher-ctx.patch | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/products/GMSHPLUGIN.pyconf b/products/GMSHPLUGIN.pyconf index 09d06f1..048d905 100644 --- a/products/GMSHPLUGIN.pyconf +++ b/products/GMSHPLUGIN.pyconf @@ -34,7 +34,7 @@ default : default_win : { - patches : ['patches/GMSHPlugin_Mesher-ctx.patch'] + patches : ['GMSHPlugin_Mesher-ctx.patch'] } version_8_1_0_to_9_1_0 : diff --git a/products/patches/GMSHPlugin_Mesher-ctx.patch b/products/patches/GMSHPlugin_Mesher-ctx.patch index 814b2fe..5112222 100644 --- a/products/patches/GMSHPlugin_Mesher-ctx.patch +++ b/products/patches/GMSHPlugin_Mesher-ctx.patch @@ -1,15 +1,14 @@ diff --git a/src/GMSHPlugin/GMSHPlugin_Mesher.cxx b/src/GMSHPlugin/GMSHPlugin_Mesher.cxx -index 8ac85b5..3a5c1ad 100644 +index 8ac85b5..a9a691a 100644 --- a/src/GMSHPlugin/GMSHPlugin_Mesher.cxx +++ b/src/GMSHPlugin/GMSHPlugin_Mesher.cxx -@@ -1028,8 +1028,10 @@ void GMSHPlugin_Mesher::mymsg::operator()(std::string level, std::string msg) +@@ -1028,7 +1028,9 @@ void GMSHPlugin_Mesher::mymsg::operator()(std::string level, std::string msg) } if (level == "Fatal") { +#ifndef WIN32 CTX::instance()->lock = 0; - throw oss.str(); +#endif + throw oss.str(); } else - printf("%s\n", oss.str().c_str()); -- 2.39.2