fix for failure to create a backup file when specifying a relative path as command...

--HG--
branch : stable

diff --git a/Src/Merge.cpp b/Src/Merge.cpp
index 6596cb0..9540834 100644 (file)
--- a/Src/Merge.cpp
+++ b/Src/Merge.cpp
@@ -930,7 +930,7 @@ BOOL CMergeApp::CreateBackup(BOOL bFolder, const String& pszPath)
                String filename;
                String ext;
        
-               paths_SplitFilename(pszPath, &path, &filename, &ext);
+               paths_SplitFilename(paths_GetLongPath(pszPath), &path, &filename, &ext);
 
                // Determine backup folder
                if (GetOptionsMgr()->GetInt(OPT_BACKUP_LOCATION) ==