← Back to branch summary

~ubuntu-branches/ubuntu/precise/me-tv/precise-proposed

« back to all changes in this revision

Viewing changes to src/scheduled_recording_manager.cc

  • Committer: Bazaar Package Importer
  • Author(s): Teis Dreijer, Teis Dreijer, Julian Andres Klode
  • Date: 2009-12-06 11:49:53 UTC
  • mfrom: (1.1.9 upstream) (3.1.7 sid)
  • Revision ID: james.westby@ubuntu.com-20091206114953-7agz1kws9au11tww
Tags: 1.0.2-1
[ Teis Dreijer ]
* New upstream release

[ Julian Andres Klode ]
* Delete me-tv.schemas in the clean target (see upstream bug LP #493132).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/scheduled_recording_manager.cc
64
64
{
65
65
        Glib::RecMutex::Lock lock(mutex);
66
66
 
67
 
        g_debug("Saving %d scheduled recordings", scheduled_recordings.size());
 
67
        g_debug("Saving %d scheduled recordings", (int)scheduled_recordings.size());
68
68
        
69
69
        Data::Table table = get_application().get_schema().tables["scheduled_recording"];       
70
70
        Data::DataTable data_table(table);
111
111
                ScheduledRecording& current = *i;
112
112
 
113
113
                // Check for conflict
114
 
                if (current.channel_id != scheduled_recording.channel_id && scheduled_recording.overlaps(current))
 
114
                if (current.scheduled_recording_id != scheduled_recording.scheduled_recording_id &&
 
115
                    current.channel_id != scheduled_recording.channel_id &&
 
116
                    scheduled_recording.overlaps(current))
115
117
                {
116
118
                        Glib::ustring message =  Glib::ustring::compose(
117
119
                                _("Failed to save scheduled recording because it conflicts with another scheduled recording called '%1'."),