From ef0f1fcd55be905d40d47633a7bb6a27ea299bb7 Mon Sep 17 00:00:00 2001
From: charras <Unknown>
Date: Tue, 22 Jul 2008 05:29:16 +0000
Subject: [PATCH] pcbnew: in append board function: new board name set to
 <oldboardname>-append.brd

---
 pcbnew/files.cpp | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/pcbnew/files.cpp b/pcbnew/files.cpp
index 648ea33292..6d08f1579f 100644
--- a/pcbnew/files.cpp
+++ b/pcbnew/files.cpp
@@ -210,9 +210,6 @@ int WinEDA_PcbFrame::LoadOnePcbFile( const wxString& FullFileName, bool Append )
         DisplayInfo( this, _( "This file was created by an older version of PCBnew. It will be stored in the new file format when you save this file again."));
     }
 
-    SetTitle( GetScreen()->m_FileName );
-    SetLastProject( GetScreen()->m_FileName );
-
     // Reload the corresponding configuration file:
     wxSetWorkingDirectory( wxPathOnly( GetScreen()->m_FileName ) );
     if( Append )
@@ -234,13 +231,24 @@ int WinEDA_PcbFrame::LoadOnePcbFile( const wxString& FullFileName, bool Append )
 
     GetScreen()->ClrModify();
 
+    /* If append option: change the initial board name to <oldname>-append.brd */
     if( Append )
     {
+        wxString new_filename = GetScreen()->m_FileName.BeforeLast('.');
+        if ( ! new_filename.EndsWith(wxT("-append")) )
+            new_filename += wxT("-append");
+
+        new_filename += PcbExtBuffer;
+
         GetScreen()->SetModify();
-        GetScreen()->m_FileName.Printf( wxT( "%s%cboard_append%s" ),
-                  wxGetCwd().GetData(), DIR_SEP, PcbExtBuffer.GetData() );
+        GetScreen()->m_FileName = new_filename;
     }
 
+    GetScreen()->m_FileName.Replace( WIN_STRING_DIR_SEP, UNIX_STRING_DIR_SEP );
+
+    SetTitle( GetScreen()->m_FileName );
+    SetLastProject( GetScreen()->m_FileName );
+
     /* Rebuild the new pad list (for drc and ratsnet control ...) */
     build_liste_pads();