和尚夹具判断与文件选择之间的关系

@@ -477,8 +477,11 @@ BOOL SettingsDlgInit( HWND hDlg )
     //
     //
     // fill port combo box and make initial selection
     // fill port combo box and make initial selection
     //
     //
-    for (wCount = 0; wCount < wMaxCOM; wCount++) {
-	wsprintf( szBuffer, "%s%d", (LPSTR) szTemp, wCount + 1 ) ;
+    for (wCount = 0; wCount < 255; wCount++) 
+	{
+		if (TTYInfo.unOpenedPortAry[wCount] == 0)
+			continue;;
+		wsprintf( szBuffer, "%s%d", (LPSTR) szTemp, TTYInfo.unOpenedPortAry[wCount] ) ;
 	SendDlgItemMessage( hDlg, IDC_PORTCOMBO, CB_ADDSTRING, 0,
 	SendDlgItemMessage( hDlg, IDC_PORTCOMBO, CB_ADDSTRING, 0,
 			    (LPARAM) (LPSTR) szBuffer ) ;
 			    (LPARAM) (LPSTR) szBuffer ) ;
     }
     }
@@ -671,11 +674,6 @@ BOOL CALLBACK ToolbarProc(HWND hWndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 		{
 		{
 		case IDC_BUTTON2_SEC_BINFILE:
 		case IDC_BUTTON2_SEC_BINFILE:
 			{
 			{
-				if (TTYInfo.DownloadReday == FALSE)
-				{
-					MessageBox(ghwndMain, "请合上夹具", "提示!", MB_OK);
-					return;
-				}
 				if (strlen(TTYInfo.szFileName) == 0)
 				if (strlen(TTYInfo.szFileName) == 0)
 				{
 				{
 					char * szFilter = "Text Files\0*.*\0";
 					char * szFilter = "Text Files\0*.*\0";
@@ -694,6 +692,11 @@ BOOL CALLBACK ToolbarProc(HWND hWndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 					SetWindowText(GetDlgItem(hWndDlg, IDC_BUTTON2_SEC_BINFILE), "下载软件");
 					SetWindowText(GetDlgItem(hWndDlg, IDC_BUTTON2_SEC_BINFILE), "下载软件");
 
 
 				}
 				}
+				if (TTYInfo.DownloadReday == FALSE)
+				{
+					MessageBox(ghwndMain, "请合上夹具", "提示!", MB_OK);
+					return;
+				}
 
 
 
 
 				if (TRUE)
 				if (TRUE)

@@ -76,6 +76,7 @@ struct TTYInfoStruct
     int     xSize, ySize, xScroll, yScroll, xOffset, yOffset,
     int     xSize, ySize, xScroll, yScroll, xOffset, yOffset,
             nColumn, nRow, xChar, yChar , nCharPos;
             nColumn, nRow, xChar, yChar , nCharPos;
 	char szFileName[MAX_PATH];
 	char szFileName[MAX_PATH];
+	BYTE unOpenedPortAry[255];
 	BOOL DownloadReday;
 	BOOL DownloadReday;
 
 
 } TTYInfo;
 } TTYInfo;