4 files changed, 16 insertions, 12 deletions
diff --git a/PumpKINDlg.cpp b/PumpKINDlg.cpp
index 1e6d03f..0b3bf41 100644
--- a/PumpKINDlg.cpp
+++ b/PumpKINDlg.cpp
@@ -1217,11 +1217,15 @@ BOOL CWRQSocket::Create(LPCTSTR localFile,LPCTSTR hostName)
                return FALSE;
        ASSERT(m_Daddy);
        ASSERT(m_Peer.sin_addr.s_addr!=INADDR_NONE || hostName);
        m_Daddy->m_Xfers[m_hSocket]=this;
-        TurnSlashes(m_FileName,TRUE);
        UpdateList();
-CString fn = localFile?ApplyRootGently(localFile):ApplyRoot(m_FileName);
+CString lf;
+         if(!localFile) {
+                lf = m_FileName;
+                TurnSlashes(lf,TRUE);
+        }
+CString fn = localFile?ApplyRootGently(localFile):ApplyRoot(lf);
                if(!localFile){// This is an incoming request..
                if(CheckBadRelativeness(m_FileName)){
                        Deny(tftp::errAccessViolation,IDS_TFTP_ERROR_ACCESS);
                        return TRUE;
diff --git a/install/install.cpp b/install/install.cpp
index 62f1e20..6fa4ae4 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -1,8 +1,8 @@
 #include "resource.h"
 #include "../shared-code/install.h"
-        #defineKINAME "PumpKIN 2.5"
+        #defineKINAME "PumpKIN 2.5.1-trunk"
 #define SKINAME "PumpKIN"
 BOOL Install(void)
 {
diff --git a/install/install.rc b/install/install.rc
index b1a3037..30907ad 100644
--- a/install/install.rc
+++ b/install/install.rc
@@ -130,10 +130,10 @@ IDI_ICON                ICON    DISCARDABLE     "../shared-data/install-icon.ico
 // Version
 //
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,5,0,0
+ FILEVERSION 2,5,1,0
- PRODUCTVERSION 2,5,0,0
+ PRODUCTVERSION 2,5,1,0
 FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
 FILEFLAGS 0x1L
 #else
@@ -148,15 +148,15 @@ BEGIN
        BLOCK "040904b0"
        BEGIN
            VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0"
            VALUE "FileDescription", "INSTALL: PumpKIN, tftp client/daemon\0"
-            VALUE "FileVersion", "2, 5, 0, 0\0"
+            VALUE "FileVersion", "2, 5, 1, 0\0"
            VALUE "InternalName", "INSTALL\0"
            VALUE "LegalCopyright", "Copyright � 1997-2004 Klever Group (http://www.klever.net/)\0"
            VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0"
            VALUE "OriginalFilename", "INSTALL.EXE\0"
            VALUE "ProductName", "PumpKIN\0"
-            VALUE "ProductVersion", "2, 5, 0, 0\0"
+            VALUE "ProductVersion", "2, 5, 1, 0\0"
        END
    END
    BLOCK "VarFileInfo"
    BEGIN
diff --git a/pumpkin.rc b/pumpkin.rc
index 67e5b24..7380e12 100644
--- a/pumpkin.rc
+++ b/pumpkin.rc
@@ -81,9 +81,9 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "About PumpKIN"
 FONT 8, "MS Sans Serif"
 BEGIN
    ICON            IDR_MAINFRAME,IDC_STATIC,7,17,18,20
-    LTEXT           "PumpKIN, Version 2.5",IDC_STATIC,40,15,119,8,SS_NOPREFIX
+    LTEXT           "PumpKIN, Version 2.5.1-trunk",IDC_STATIC,40,15,119,8,SS_NOPREFIX
    LTEXT           "Copyright � 1997-2004 Klever Group",IDC_STATIC,40,30,170,
                    8
    DEFPUSHBUTTON   "OK",IDOK,178,7,32,14,WS_GROUP
    PUSHBUTTON      "http://www.klever.net/",IDC_KLEVERNET,124,53,86,14
@@ -285,10 +285,10 @@ END
 // Version
 //
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,5,0,0
+ FILEVERSION 2,5,1,0
- PRODUCTVERSION 2,5,0,0
+ PRODUCTVERSION 2,5,1,0
 FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
 FILEFLAGS 0x1L
 #else
@@ -303,15 +303,15 @@ BEGIN
        BLOCK "040904b0"
        BEGIN
            VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0"
            VALUE "FileDescription", "PumpKIN, tftp client/daemon\0"
-            VALUE "FileVersion", "2, 5, 0, 0\0"
+            VALUE "FileVersion", "2, 5, 1, 0\0"
            VALUE "InternalName", "PUMPKIN\0"
            VALUE "LegalCopyright", "Copyright � 1997-2004 Klever Group (http://www.klever.net)\0"
            VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0"
            VALUE "OriginalFilename", "PUMPKIN.EXE\0"
            VALUE "ProductName", "PumpKIN\0"
-            VALUE "ProductVersion", "2, 5, 0, 0\0"
+            VALUE "ProductVersion", "2, 5, 1, 0\0"
        END
    END
    BLOCK "VarFileInfo"
    BEGIN