# HG changeset patch
# User David McClosky <dmcc@bigasterisk.com>
# Date 2007-06-15 20:12:54
# Node ID b2469273289e78ea11246c2a2810882dfe133a1f
# Parent  058f2f50850459c7ecdb7b7999d7c9e7c27bbdd4

Submaster: set URI from loaded file

diff --git a/light9/Submaster.py b/light9/Submaster.py
--- a/light9/Submaster.py
+++ b/light9/Submaster.py
@@ -65,8 +65,8 @@ class Submaster:
             if graph is None:
                 graph = Graph()
                 graph.parse(showconfig.subFile(self.name), format="nt")
-            subUri = L9['sub/%s' % self.name]
-            for lev in graph.objects(subUri, L9['lightLevel']):
+            self.uri = L9['sub/%s' % self.name]
+            for lev in graph.objects(self.uri, L9['lightLevel']):
                 chan = graph.value(lev, L9['channel'])
                 val = graph.value(lev, L9['level'])
                 name = patchGraph.label(chan)
@@ -233,6 +233,7 @@ class Submasters:
             else:
                 notsongs.append(s)
         combined = notsongs + songs
+
         return combined
     def get_all_sub_names(self):
         return [s.name for s in self.get_all_subs()]