1 files changed, 26 insertions, 8 deletions
diff --git a/src/Common/Dlgcode.c b/src/Common/Dlgcode.c
index bfa8a32e..cc66506c 100644
--- a/src/Common/Dlgcode.c
+++ b/src/Common/Dlgcode.c
@@ -4348,16 +4348,32 @@ string GetUserFriendlyVersionString (int version)
 	versionString.insert (version > 0xfff ? 2 : 1,".");
 
 	if (versionString[versionString.length()-1] == '0')
 		versionString.erase (versionString.length()-1, 1); 
 
 	return (versionString);
 }
 
+string IntToString (int val)
+{
+	char szTmp [64];
+	StringCbPrintfA (szTmp, sizeof(szTmp), "%d", val);
+
+	return szTmp;
+}
+
+wstring IntToWideString (int val)
+{
+	wchar_t szTmp [64];
+	StringCbPrintfW (szTmp, sizeof(szTmp), L"%d", val);
+
+	return szTmp;
+}
+
 void GetSizeString (unsigned __int64 size, wchar_t *str, size_t cbStr)
 {
 	static wchar_t *b, *kb, *mb, *gb, *tb, *pb;
 	static int serNo;
 
 	if (b == NULL || serNo != LocalizationSerialNo)
 	{
 		serNo = LocalizationSerialNo;
@@ -10715,24 +10731,26 @@ std::string FindLatestFileOrDirectory (const std::string &directory, const char
 		return name;
 
 	return string (directory) + "\\" + name;
 }
 
 int GetPin (HWND hwndDlg, UINT ctrlId)
 {
 	int pin = 0;
-	char szTmp[MAX_PIN + 1] = {0};
-	GetDlgItemText (hwndDlg, ctrlId, szTmp, MAX_PIN + 1);
-	if (strlen(szTmp))
-	{
-		char* endPtr = NULL;
-		pin = strtol(szTmp, &endPtr, 0);
-		if (pin < 0 || endPtr == szTmp || !endPtr || *endPtr != '\0')
-			pin = 0;
+	if (IsWindowEnabled (GetDlgItem (hwndDlg, ctrlId)))
+	{
+		char szTmp[MAX_PIN + 1] = {0};
+		if (GetDlgItemText (hwndDlg, ctrlId, szTmp, MAX_PIN + 1) > 0)
+		{
+			char* endPtr = NULL;
+			pin = strtol(szTmp, &endPtr, 10);
+			if (pin < 0 || endPtr == szTmp || !endPtr || *endPtr != '\0')
+				pin = 0;
+		}
 	}
 	return pin;
 }
 
 void SetPin (HWND hwndDlg, UINT ctrlId, int pin)
 {
 	if (pin > 0)
 	{