Commit 8fee495d authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

qt: remove tautology

(The libvlc object is always "alive" since it is never "killed").
parent c982218c
......@@ -380,14 +380,11 @@ static void Close(vlc_object_t *p_this)
msg_Dbg(p_demux,"Close AVCapture");
if ( vlc_object_alive(p_this->p_libvlc) )
{
// Perform this on main thread, as the framework itself will sometimes try to synchronously
// work on main thread. And this will create a dead lock.
[p_sys->session performSelectorOnMainThread:@selector(stopRunning) withObject:nil waitUntilDone:NO];
[p_sys->output performSelectorOnMainThread:@selector(release) withObject:nil waitUntilDone:NO];
[p_sys->session performSelectorOnMainThread:@selector(release) withObject:nil waitUntilDone:NO];
}
free(p_sys);
......
......@@ -395,16 +395,11 @@ static void Close(vlc_object_t *p_this)
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys = p_demux->p_sys;
/* Hack: if libvlc was killed, main interface thread was,
* and poor QTKit needs it, so don't tell him.
* Else we dead lock. */
if (vlc_object_alive(p_this->p_libvlc)) {
// Perform this on main thread, as the framework itself will sometimes try to synchronously
// work on main thread. And this will create a dead lock.
[p_sys->session performSelectorOnMainThread:@selector(stopRunning) withObject:nil waitUntilDone:NO];
[p_sys->output performSelectorOnMainThread:@selector(release) withObject:nil waitUntilDone:NO];
[p_sys->session performSelectorOnMainThread:@selector(release) withObject:nil waitUntilDone:NO];
}
free(p_sys);
[pool release];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment