vlc_credential: fix store behavior

croepha · Feb 29, 2016 · b1c9947 · b1c9947
1 parent 39c8ea3
commit b1c9947
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/include/vlc_keystore.h b/include/vlc_keystore.h
@@ -244,8 +244,9 @@ vlc_credential_get(vlc_credential *p_credential, vlc_object_t *p_parent,
 /**
  * Store the last dialog credential returned by vlc_credential_get()
  *
- * This function will store the credential only if it comes from the dialog and
- * if the vlc_keystore object is valid.
+ * This function will store the credential in the memory keystore if it's
+ * valid, or will store in the permanent one if it comes from the dialog and if
+ * the user asked for it.
  *
  * @return true if the credential was stored or comes from the keystore, false
  * otherwise

diff --git a/src/misc/keystore.c b/src/misc/keystore.c
@@ -496,6 +496,8 @@ vlc_credential_get(vlc_credential *p_credential, vlc_object_t *p_parent,
 bool
 vlc_credential_store(vlc_credential *p_credential, vlc_object_t *p_parent)
 {
+    if (!is_credential_valid(p_credential))
+        return false;
     /* Don't need to store again */
     if (p_credential->b_from_keystore)
         return p_credential->b_from_keystore;