[mythtv-commits] mythtv commit: r8862 by danielk

[mythtv@cvs.mythtv.org]

      Author: danielk
        Date: 2006-02-04 20:00:03 +0000 (Sat, 04 Feb 2006)
New Revision: 8862
   Changeset: http://cvs.mythtv.org/trac/changeset/8862

Modified:

   trunk/mythtv/libs/libmythtv/tv_play.cpp

Log:

References #942.

This commit moves the pthread_join on the NVP thread outside the osdlock, so that it is safe for the NVP to grab the qApp lock.

While trying to reproduce the bug in #942, I got the "Error encountered while displaying video" dialog. This was expected with what I was doing, but I didn't expect it to stop responding to input. Turns out that the NVP grabs a qApp lock when displaying this error dialog, but it does it while we are waiting for the thread to finish while holding the osdlock. If anything else is holding the qApp lock and tries to get the osdlock (which is the normal lock order), then we get into a deadlock situation between those two threads.