release 1.0.14rc3

Patch-level: Merged

diff --git a/configure.in b/configure.in
index 3b677d2d16d43742ec81d762ba1c8f81c22ac4b9..e4e8d0b327cef52c30d587990a1c2c8d907d6572 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -9,7 +9,7 @@ dnl add API = c+1:0:a+1
 dnl remove API = c+1:0:0
 dnl *************************************************
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(alsa-lib, 1.0.14rc2)
+AM_INIT_AUTOMAKE(alsa-lib, 1.0.14rc3)
 eval LIBTOOL_VERSION_INFO="2:0:0"
 dnl *************************************************
 AM_CONDITIONAL(INSTALL_M4, test -n "${ACLOCAL}")

diff --git a/src/control/namehint.c b/src/control/namehint.c
index 7eecc78560b29927e5de9b17f1221eb408d4beb9..4101134180b41eb4cd536b3c8965aa040c26b22e 100644 (file)
--- a/src/control/namehint.c
+++ b/src/control/namehint.c
@@ -532,7 +532,9 @@ int snd_device_name_hint(int card, const char *iface, void ***hints)
        if (snd_config_search(snd_config, "defaults.namehint.showall", &conf) >= 0)
                list.show_all = snd_config_get_bool(conf) > 0;
        if (card >= 0) {
-               err = add_card(&list, card);
+               err = get_card_name(&list, card);
+               if (err >= 0)
+                       err = add_card(&list, card);
        } else {
                err = snd_card_next(&card);
                if (err < 0)