ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-26 17:30:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into V9_3_BR

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/SMESHUtils/SMESH_File.cxx
View File

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

4
src/SMESH_I/SMESH_Mesh_i.cxx
View File

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