Commit 375310f2 authored by jean-pierre charras's avatar jean-pierre charras
Browse files

3D view: Fix Bug #908871 

Eeschema: fix a minor issue.
parent 750dd6ee

3d-viewer/3d_read_mesh.cpp

+10 −3
Original line number Diff line number Diff line
@@ -49,13 +49,20 @@ int S3D_MASTER::ReadData() 
        return 1;

    }



    if( wxFileName::FileExists( m_Shape3DName ) )

    wxString shape3DNname = m_Shape3DName;

#ifdef __WINDOWS__

    shape3DNname.Replace( wxT("/"), wxT("\\") );

#else

    shape3DNname.Replace( wxT("\\"), wxT("/") );

#endif



    if( wxFileName::FileExists( shape3DNname ) )

    {

        FullFilename = m_Shape3DName;

        FullFilename = shape3DNname;

    }

    else

    {

        fn = m_Shape3DName;

        fn = shape3DNname;

        FullFilename = wxGetApp().FindLibraryPath( fn );



        if( FullFilename.IsEmpty() )

eeschema/libedit.cpp

+4 −2
Original line number Diff line number Diff line
@@ -322,6 +322,7 @@ void LIB_EDIT_FRAME::SaveActiveLibrary( wxCommandEvent& event ) 
    if( libFileName.FileExists() )

    {

        backupFileName.SetExt( wxT( "bak" ) );

        if( backupFileName.FileExists() )

            wxRemoveFile( backupFileName.GetFullPath() );



        if( !wxRenameFile( libFileName.GetFullPath(), backupFileName.GetFullPath() ) )
@@ -361,6 +362,7 @@ void LIB_EDIT_FRAME::SaveActiveLibrary( wxCommandEvent& event ) 
    if( docFileName.FileExists() )

    {

        backupFileName.SetExt( wxT( "bck" ) );

        if( backupFileName.FileExists() )

            wxRemoveFile( backupFileName.GetFullPath() );



        if( !wxRenameFile( docFileName.GetFullPath(), backupFileName.GetFullPath() ) )