mirror of
				https://github.com/pbatard/rufus.git
				synced 2024-08-14 23:57:05 +00:00 
			
		
		
		
	[net] fix Fido script not being able to be launched again on user cancel
* Also update workflows to latest setup-msbuild * Closes #2419
This commit is contained in:
		
							parent
							
								
									ac9a3f42d8
								
							
						
					
					
						commit
						1be7eaf306
					
				
					 5 changed files with 10 additions and 9 deletions
				
			
		
							
								
								
									
										2
									
								
								.github/workflows/codeql.yml
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/codeql.yml
									
										
									
									
										vendored
									
									
								
							|  | @ -48,7 +48,7 @@ jobs: | |||
|         languages: cpp | ||||
| 
 | ||||
|     - name: Add MSBuild to PATH | ||||
|       uses: microsoft/setup-msbuild@v1.1 | ||||
|       uses: microsoft/setup-msbuild@v2 | ||||
|       with: | ||||
|         msbuild-architecture: x64 | ||||
| 
 | ||||
|  |  | |||
							
								
								
									
										2
									
								
								.github/workflows/coverity.yml
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/coverity.yml
									
										
									
									
										vendored
									
									
								
							|  | @ -44,7 +44,7 @@ jobs: | |||
|       run: echo "${{github.workspace}}/cov-analysis-win64/bin" >> $GITHUB_PATH | ||||
| 
 | ||||
|     - name: Add MSBuild to PATH | ||||
|       uses: microsoft/setup-msbuild@v1.1 | ||||
|       uses: microsoft/setup-msbuild@v2 | ||||
| 
 | ||||
|     - name: Build with Coverity | ||||
|       run: |  | ||||
|  |  | |||
							
								
								
									
										2
									
								
								.github/workflows/vs2022.yml
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/vs2022.yml
									
										
									
									
										vendored
									
									
								
							|  | @ -45,7 +45,7 @@ jobs: | |||
|         submodules: recursive | ||||
| 
 | ||||
|     - name: Add MSBuild to PATH | ||||
|       uses: microsoft/setup-msbuild@v1 | ||||
|       uses: microsoft/setup-msbuild@v2 | ||||
|       with: | ||||
|         msbuild-architecture: x64 | ||||
| 
 | ||||
|  |  | |||
|  | @ -1,7 +1,7 @@ | |||
| /*
 | ||||
|  * Rufus: The Reliable USB Formatting Utility | ||||
|  * Networking functionality (web file download, check for update, etc.) | ||||
|  * Copyright © 2012-2023 Pete Batard <pete@akeo.ie> | ||||
|  * Copyright © 2012-2024 Pete Batard <pete@akeo.ie> | ||||
|  * | ||||
|  * This program is free software: you can redistribute it and/or modify | ||||
|  * it under the terms of the GNU General Public License as published by | ||||
|  | @ -848,6 +848,7 @@ static DWORD WINAPI DownloadISOThread(LPVOID param) | |||
| 	uprintf("Script signature is valid ✓"); | ||||
| #endif | ||||
| 
 | ||||
| 	FormatStatus = 0; | ||||
| 	dwExitCode = RunCommand(cmdline, app_data_dir, TRUE); | ||||
| 	uprintf("Exited download script with code: %d", dwExitCode); | ||||
| 	if ((dwExitCode == 0) && PeekNamedPipe(hPipe, NULL, dwPipeSize, NULL, &dwAvail, NULL) && (dwAvail != 0)) { | ||||
|  |  | |||
							
								
								
									
										10
									
								
								src/rufus.rc
									
										
									
									
									
								
							
							
						
						
									
										10
									
								
								src/rufus.rc
									
										
									
									
									
								
							|  | @ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL | |||
| IDD_DIALOG DIALOGEX 12, 12, 232, 326 | ||||
| STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | ||||
| EXSTYLE WS_EX_ACCEPTFILES | ||||
| CAPTION "Rufus 4.5.2107" | ||||
| CAPTION "Rufus 4.5.2108" | ||||
| FONT 9, "Segoe UI Symbol", 400, 0, 0x0 | ||||
| BEGIN | ||||
|     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP | ||||
|  | @ -392,8 +392,8 @@ END | |||
| // | ||||
| 
 | ||||
| VS_VERSION_INFO VERSIONINFO | ||||
|  FILEVERSION 4,5,2107,0 | ||||
|  PRODUCTVERSION 4,5,2107,0 | ||||
|  FILEVERSION 4,5,2108,0 | ||||
|  PRODUCTVERSION 4,5,2108,0 | ||||
|  FILEFLAGSMASK 0x3fL | ||||
| #ifdef _DEBUG | ||||
|  FILEFLAGS 0x1L | ||||
|  | @ -411,13 +411,13 @@ BEGIN | |||
|             VALUE "Comments", "https://rufus.ie" | ||||
|             VALUE "CompanyName", "Akeo Consulting" | ||||
|             VALUE "FileDescription", "Rufus" | ||||
|             VALUE "FileVersion", "4.5.2107" | ||||
|             VALUE "FileVersion", "4.5.2108" | ||||
|             VALUE "InternalName", "Rufus" | ||||
|             VALUE "LegalCopyright", "© 2011-2024 Pete Batard (GPL v3)" | ||||
|             VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html" | ||||
|             VALUE "OriginalFilename", "rufus-4.5.exe" | ||||
|             VALUE "ProductName", "Rufus" | ||||
|             VALUE "ProductVersion", "4.5.2107" | ||||
|             VALUE "ProductVersion", "4.5.2108" | ||||
|         END | ||||
|     END | ||||
|     BLOCK "VarFileInfo" | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue