Merge branch 'master' into V9_3_BR

This commit is contained in:
vsr 2019-04-03 19:00:08 +03:00
commit 58a7aa4445
2 changed files with 4 additions and 2 deletions

View File

@ -319,6 +319,8 @@ bool SMESH_File::getInts(std::vector<int>& ints)
bool SMESH_File::openForWriting()
{
close();
#ifdef WIN32
#ifdef UNICODE
std::wstring aName = Kernel_Utils::utf8_decode_s(_name);

View File

@ -3283,7 +3283,7 @@ CORBA::Boolean SMESH_Mesh_i::HasDuplicatedGroupNamesMED()
void SMESH_Mesh_i::PrepareForWriting (const char* file, bool overwrite)
{
SMESH_File aFile( file );
SMESH_File aFile( file, false );
SMESH_Comment msg;
if ( aFile.exists() ) {
// existing filesystem node