From 9ebdecc124a7b7f028b6c7ce22dcb69b781f52b5 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Wed, 17 Feb 2016 11:38:12 +0000 Subject: [PATCH] [ui] fix label not being blanked on device removal * Part of #694 * Also set rufus-next to 2.8 --- configure | 20 ++++++++++---------- configure.ac | 2 +- src/rufus.c | 8 +++++--- src/rufus.rc | 10 +++++----- 4 files changed, 21 insertions(+), 19 deletions(-) diff --git a/configure b/configure index db419884..8812587f 100644 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for rufus 2.7. +# Generated by GNU Autoconf 2.69 for rufus 2.8. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='rufus' PACKAGE_TARNAME='rufus' -PACKAGE_VERSION='2.7' -PACKAGE_STRING='rufus 2.7' +PACKAGE_VERSION='2.8' +PACKAGE_STRING='rufus 2.8' PACKAGE_BUGREPORT='https://github.com/pbatard/rufus/issues' PACKAGE_URL='http://rufus.akeo.ie' @@ -1228,7 +1228,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures rufus 2.7 to adapt to many kinds of systems. +\`configure' configures rufus 2.8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1294,7 +1294,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of rufus 2.7:";; + short | recursive ) echo "Configuration of rufus 2.8:";; esac cat <<\_ACEOF @@ -1385,7 +1385,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -rufus configure 2.7 +rufus configure 2.8 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1440,7 +1440,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by rufus $as_me 2.7, which was +It was created by rufus $as_me 2.8, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2303,7 +2303,7 @@ fi # Define the identity of the package. PACKAGE='rufus' - VERSION='2.7' + VERSION='2.8' cat >>confdefs.h <<_ACEOF @@ -4480,7 +4480,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by rufus $as_me 2.7, which was +This file was extended by rufus $as_me 2.8, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4534,7 +4534,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -rufus config.status 2.7 +rufus config.status 2.8 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 32ecdfc5..b40bed1f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([rufus], [2.7], [https://github.com/pbatard/rufus/issues], [rufus], [http://rufus.akeo.ie]) +AC_INIT([rufus], [2.8], [https://github.com/pbatard/rufus/issues], [rufus], [http://rufus.akeo.ie]) AM_INIT_AUTOMAKE([-Wno-portability foreign no-dist no-dependencies]) AC_CONFIG_SRCDIR([src/rufus.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/src/rufus.c b/src/rufus.c index 377449e9..8c42f241 100644 --- a/src/rufus.c +++ b/src/rufus.c @@ -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; } diff --git a/src/rufus.rc b/src/rufus.rc index 4e650db2..9b43696e 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -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"