[mythtv-commits] mythtv commit: r14362 - in branches/mythtv-multirec by danielk

[mythtv at cvs.mythtv.org]

      Author: danielk
        Date: 2007-08-30 18:41:03 +0000 (Thu, 30 Aug 2007)
New Revision: 14362
   Changeset: http://cvs.mythtv.org/trac/changeset/14362

Modified:

   branches/mythtv-multirec/libs/libmyth/mythcontext.h
   branches/mythtv-multirec/libs/libmyth/mythdialogs.cpp
   branches/mythtv-multirec/libs/libmyth/mythdialogs.h
   branches/mythtv-multirec/libs/libmyth/settings.cpp
   branches/mythtv-multirec/libs/libmyth/settings.h
   branches/mythtv-multirec/libs/libmythtv/recordingprofile.cpp
   branches/mythtv-multirec/libs/libmythtv/scanwizardhelpers.cpp
   branches/mythtv-multirec/libs/libmythtv/scanwizardhelpers.h
   branches/mythtv-multirec/libs/libmythtv/scanwizardscanner.cpp
   branches/mythtv-multirec/libs/libmythtv/scanwizardscanner.h
   branches/mythtv-multirec/libs/libmythtv/tv_play.cpp
   branches/mythtv-multirec/programs/mythfrontend/playbackbox.cpp
   branches/mythtv-multirec/programs/mythfrontend/playbackbox.h
   branches/mythtv-multirec/programs/mythwelcome/welcomedialog.cpp
   branches/mythtv-multirec/programs/mythwelcome/welcomedialog.h

Log:

Refs #2909. Refs #3326. Fixes Channel Scan popup segfault in mythtv-multirec.

The problem when we applied this to trunk in [12624] & [12629] which caused the reversion in [12635] appears to have been the addition of some popupDone() signals when we were done with a MythPopupBox. This signal is interpreted in several places in playbackbox,cpp and once in welcomedialog.cpp to mean the popup was rejected not just done. I've added the return value to the popupDone signal so that these uses can be supported by simply checking that the return value is Rejected before interpreting the signal as a cancel.

I'm fixing this in multirec is because the changes in multirec make the lack of thread safety in the popup handling cause a reproducable segfault every time you run the same channel scan twice. In the trunk this segfault is relatively rare.