← Back to branch summary

~ubuntu-branches/ubuntu/lucid/mythplugins/lucid

« back to all changes in this revision

Viewing changes to mythvideo/mythvideo/editmetadata.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Mario Limonciello
  • Date: 2009-10-13 01:57:50 UTC
  • mfrom: (1.1.35 upstream)
  • Revision ID: james.westby@ubuntu.com-20091013015750-t5uj418d1hf4phwl
Tags: 0.22.0~trunk22413-0ubuntu1
https://launchpad.net/bugs/445998
* New upstream checkout (r22413)
  - Fixes bug where you have to enter/leave mythvideo for 5 seconds.
* debian/mythweb.{default,postinst,config}:
  - Read debconf answers from /etc/default/mythweb if they're present
    and we're running in noninteractive.  Allows configuration from MCC.
    (LP: #445998)

Show diffs side-by-side

added added

removed removed

Lines of Context:
mythvideo/mythvideo/editmetadata.cpp
337
337
                    target_name.left((int)(length_compare * 0.75));
338
338
 
339
339
            if (caught_name_three_quarters == target_name_three_quarters &&
340
 
                m_workingMetadata->GetChildID() == -1)
 
340
                m_workingMetadata->GetChildID() == -1 &&
 
341
                !(m_workingMetadata->GetSeason() > 0) &&
 
342
                !(m_workingMetadata->GetEpisode() > 0))
341
343
            {
342
344
                possible_starting_point = p->first;
343
345
                m_workingMetadata->SetChildID(possible_starting_point);