[mythtv-commits] mythtv branch fixes/0.25 updated by gigem. v0.25-92-gec54484

Git Repo Owner noreply at mythtv.org
Tue May 15 15:00:33 UTC 2012


The branch, fixes/0.25 has been updated on the
mythtv repository by gitolite user gigem.
       via  ec54484a7182f5fcfc664cd9cbd1d810b17319c8 (commit)
       via  5394c987be99958464720f6e7ba8405344d67605 (commit)
      from  1dbd5131701b1f7b58fdf2e97b3d256d8e06a2db (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ec54484a7182f5fcfc664cd9cbd1d810b17319c8
Author:    David Engel <dengel at mythtv.org> at Tue, 15 May 2012 09:51:55 -0500
Committer: David Engel <dengel at mythtv.org> at Tue, 15 May 2012 10:00:16 -0500
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=ec54484a7182f5fcfc664cd9cbd1d810b17319c8

Fix updating of metadata info in RecordingRule.
Only set the metadata info from the RecordingInfo if it's not already
set.  This is should be a better fix than was commited in db123034.
(cherry picked from commit 7aebf8caa18f22fdc7ccf48d6b0130deb6e175ca)



commit 5394c987be99958464720f6e7ba8405344d67605
Author:    David Engel <dengel at mythtv.org> at Tue, 15 May 2012 09:51:10 -0500
Committer: David Engel <dengel at mythtv.org> at Tue, 15 May 2012 10:00:16 -0500
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=5394c987be99958464720f6e7ba8405344d67605

Revert "Fix editing inetref/season/episode from the PBB."
This reverts commit db123034e322be6af5104063b044933693ad2d25.

Conflicts:

	mythtv/programs/mythfrontend/scheduleeditor.cpp
(cherry picked from commit 8a279eb1d6032804f72aca7722f363992749e905)



-----------------------------------------------------------------------

Summary of changes:
 mythtv/libs/libmythtv/recordingrule.cpp         |   10 +++++--
 mythtv/programs/mythfrontend/scheduleeditor.cpp |   28 ++++++----------------
 2 files changed, 15 insertions(+), 23 deletions(-)

-- 



More information about the mythtv-commits mailing list