[mythtv-firehose] mythtv/master commit: 93c228dac by Stuart Morgan (stuartm)

[MythTV]

      Author:  Stuart Morgan <smorgan at mythtv.org>
 Change Date:  2012-02-23T13:14:12-08:00
   Push Date:  2012/02/23 13:33:23 -0800
  Repository:  mythtv
      Branch:  master
New Revision:  93c228daccfe275f0c9d21a30ea432a5c3b60b43
   Changeset:  https://github.com/MythTV/mythtv/commit/93c228dac

Log:

Prevent crash when invoking the menu dialog via the right mouse button in Watch Recordings. ShowMenu() is a virtual method in MythScreenType, it's intended purpose is to load/display the context menu but here it is displaying a menu loaded elsewhere with no guards against duplicate popups being created. Move the menu display code to DisplayPopupMenu(), restore ShowMenu() to behave the same as the MENU key binding and re-instate the guards against multiple menu dialogs being created. Also fixes #10248 - 'Cannot delete recording if file is missing'

Modified:

   mythtv/programs/mythfrontend/playbackbox.cpp
   mythtv/programs/mythfrontend/playbackbox.h