[ui] fix label not being blanked on device removal

* Part of #694
* Also set rufus-next to 2.8
This commit is contained in:
Pete Batard 2016-02-17 11:38:12 +00:00
parent f88faf1a4f
commit 9ebdecc124
4 changed files with 21 additions and 19 deletions

View file

@ -702,10 +702,12 @@ static BOOL PopulateProperties(int ComboIndex)
memset(&SelectedDrive, 0, sizeof(SelectedDrive));
if (ComboIndex < 0)
return TRUE;
goto out;
if (!SetDriveInfo(ComboIndex)) // This also populates FS
if (!SetDriveInfo(ComboIndex)) { // This also populates FS
SetProposedLabel(-1);
return FALSE;
}
SetTargetSystem();
SetFSFromISO();
EnableBootOptions(TRUE, TRUE);
@ -723,8 +725,8 @@ static BOOL PopulateProperties(int ComboIndex)
free(device_tooltip);
}
out:
SetProposedLabel(ComboIndex);
return TRUE;
}

View file

@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 242, 376
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_ACCEPTFILES
CAPTION "Rufus 2.7.858"
CAPTION "Rufus 2.8.859"
FONT 8, "Segoe UI Symbol", 400, 0, 0x0
BEGIN
LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8
@ -320,8 +320,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,7,858,0
PRODUCTVERSION 2,7,858,0
FILEVERSION 2,8,859,0
PRODUCTVERSION 2,8,859,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -338,13 +338,13 @@ BEGIN
BEGIN
VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "2.7.858"
VALUE "FileVersion", "2.8.859"
VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2016 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
VALUE "OriginalFilename", "rufus.exe"
VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "2.7.858"
VALUE "ProductVersion", "2.8.859"
END
END
BLOCK "VarFileInfo"