rygel r562 - trunk/src/rygel

[zeeshanak svn gnome org]

Author: zeeshanak
Date: Mon Feb  9 22:29:35 2009
New Revision: 562
URL: http://svn.gnome.org/viewvc/rygel?rev=562&view=rev

Log:
Don't continue handling the browse if parsing of arguments fail.

Modified:
   trunk/src/rygel/rygel-browse.vala

Modified: trunk/src/rygel/rygel-browse.vala
==============================================================================
--- trunk/src/rygel/rygel-browse.vala	(original)
+++ trunk/src/rygel/rygel-browse.vala	Mon Feb  9 22:29:35 2009
@@ -71,10 +71,8 @@
         /* Start DIDL-Lite fragment */
         this.didl_writer.start_didl_lite (null, null, true);
 
-        /* Handle incoming arguments */
+        /* Start by parsing the 'in' arguments */
         this.parse_args ();
-
-        this.fetch_media_object ();
     }
 
     private void got_media_object () {
@@ -182,6 +180,7 @@
             this.fetch_metadata = false;
             this.handle_error (
                     new ContentDirectoryError.INVALID_ARGS ("Invalid Args"));
+            return;
         }
 
         /* ObjectID */
@@ -196,7 +195,10 @@
             // Sorry we can't do anything without ObjectID
             this.handle_error (
                 new ContentDirectoryError.NO_SUCH_OBJECT ("No such object"));
+            return;
         }
+
+        this.fetch_media_object ();
     }
 
     private void conclude () {