GMSHPLUGIN: patch

diff --git a/products/GMSHPLUGIN.pyconf b/products/GMSHPLUGIN.pyconf
index 09d06f12436b927c50229a5ef95d0ffd709a7627..048d905cfab81ea1b5f8fcec6489709030941207 100644 (file)
--- 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 814b2fea86bb81e18359e0b53a9af6841ab56923..51122224505b4dba23a50dc5f69bfdb1e5037d3b 100644 (file)
--- 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());