rygel r378 - trunk/src/plugins/dvb

[zeeshanak svn gnome org]

Author: zeeshanak
Date: Thu Dec 25 12:00:40 2008
New Revision: 378
URL: http://svn.gnome.org/viewvc/rygel?rev=378&view=rev

Log:
Don't throw an error if there are no channels in group.

Modified:
   trunk/src/plugins/dvb/rygel-dvb-content-dir.vala

Modified: trunk/src/plugins/dvb/rygel-dvb-content-dir.vala
==============================================================================
--- trunk/src/plugins/dvb/rygel-dvb-content-dir.vala	(original)
+++ trunk/src/plugins/dvb/rygel-dvb-content-dir.vala	Thu Dec 25 12:00:40 2008
@@ -85,20 +85,15 @@
         DVBChannelGroup group;
 
         group = this.find_group_by_id (args.object_id);
-        if (group == null)
-            args.number_returned = 0;
-        else {
-            args.number_returned = group.add_channels (didl_writer,
-                                                       args.index,
-                                                       args.requested_count,
-                                                       out args.total_matches);
-        }
-
-        if (args.number_returned > 0) {
-            args.update_id = uint32.MAX;
-        } else {
+        if (group == null) {
             throw new ContentDirectoryError.NO_SUCH_OBJECT ("No such object");
         }
+
+        args.number_returned = group.add_channels (didl_writer,
+                                                   args.index,
+                                                   args.requested_count,
+                                                   out args.total_matches);
+        args.update_id = uint32.MAX;
     }
 
     public override void add_metadata (DIDLLiteWriter didl_writer,