[vlc-commits] fingerprinter: disable cancellation when reading stream

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Jul  8 20:17:14 2015 +0300| [4b0ee0d6980b45808310db2de6f6dc547392d926] | committer: Rémi Denis-Courmont

fingerprinter: disable cancellation when reading stream

See also 63ef5806412c2da518edce1b2c0445796123c913.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4b0ee0d6980b45808310db2de6f6dc547392d926
---

 modules/misc/fingerprinter.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/misc/fingerprinter.c b/modules/misc/fingerprinter.c
index 07d8b75..bee0608 100644
--- a/modules/misc/fingerprinter.c
+++ b/modules/misc/fingerprinter.c
@@ -386,11 +386,15 @@ static void Run( fingerprinter_thread_t *p_fingerprinter )
                 /* overwrite with hint, as in this case, fingerprint's session will be truncated */
                 if ( p_data->i_duration ) acoustid_print.i_duration = p_data->i_duration;
 
+                int canc = vlc_savecancel();
+
                 DoFingerprint( VLC_OBJECT(p_fingerprinter), p_sys, &acoustid_print );
 
                 DoAcoustIdWebRequest( VLC_OBJECT(p_fingerprinter), &acoustid_print );
                 fill_metas_with_results( p_data, &acoustid_print );
                 FREENULL( p_sys->psz_uri );
+
+                vlc_restorecancel(canc);
             }
             vlc_cleanup_run( ); // C2