From 3671b01e843cacae6ab4b869214e3f025613f838 Mon Sep 17 00:00:00 2001
From: Bryan Schumaker <bjschuma@gmail.com>
Date: Sun, 24 Oct 2010 17:12:01 -0400
Subject: [PATCH] universal_open bug

After installing a plugin, universal_open() should return rather than
continue on.
---
 libsaria/data.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/libsaria/data.py b/libsaria/data.py
index 6ea02a56..a84735e3 100644
--- a/libsaria/data.py
+++ b/libsaria/data.py
@@ -48,9 +48,13 @@ def universal_open(file):
 		if plugin == None:
 			from libsaria import plugin
 		plugin.install(file)
+		return
 	try:
-		libsaria.collection.lib_find_id(file)
-		libsaria.music.load(file)
+		id = libsaria.collection.lib_find_id(file)
+		if id:
+			libsaria.collection.lib_play_id(id)
+		else:
+			libsaria.music.load(file)
 	except Exception,e:
 		print e
 		pass