summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--PumpKINDlg.cpp8
-rw-r--r--install/install.cpp2
-rw-r--r--install/install.rc8
-rw-r--r--pumpkin.rc10
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
@@ -1220,5 +1220,9 @@ BOOL CWRQSocket::Create(LPCTSTR localFile,LPCTSTR 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..
diff --git a/install/install.cpp b/install/install.cpp
index 62f1e20..6fa4ae4 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -3,3 +3,3 @@
-#define KINAME "PumpKIN 2.5"
+#define KINAME "PumpKIN 2.5.1-trunk"
#define SKINAME "PumpKIN"
diff --git a/install/install.rc b/install/install.rc
index b1a3037..30907ad 100644
--- a/install/install.rc
+++ b/install/install.rc
@@ -133,4 +133,4 @@ IDI_ICON ICON DISCARDABLE "../shared-data/install-icon.ico
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,5,0,0
- PRODUCTVERSION 2,5,0,0
+ FILEVERSION 2,5,1,0
+ PRODUCTVERSION 2,5,1,0
FILEFLAGSMASK 0x3fL
@@ -151,3 +151,3 @@ BEGIN
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"
@@ -157,3 +157,3 @@ BEGIN
VALUE "ProductName", "PumpKIN\0"
- VALUE "ProductVersion", "2, 5, 0, 0\0"
+ VALUE "ProductVersion", "2, 5, 1, 0\0"
END
diff --git a/pumpkin.rc b/pumpkin.rc
index 67e5b24..7380e12 100644
--- a/pumpkin.rc
+++ b/pumpkin.rc
@@ -84,3 +84,3 @@ 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,
@@ -288,4 +288,4 @@ END
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,5,0,0
- PRODUCTVERSION 2,5,0,0
+ FILEVERSION 2,5,1,0
+ PRODUCTVERSION 2,5,1,0
FILEFLAGSMASK 0x3fL
@@ -306,3 +306,3 @@ BEGIN
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"
@@ -312,3 +312,3 @@ BEGIN
VALUE "ProductName", "PumpKIN\0"
- VALUE "ProductVersion", "2, 5, 0, 0\0"
+ VALUE "ProductVersion", "2, 5, 1, 0\0"
END