2 files changed, 12 insertions, 6 deletions
diff --git a/grc/python/Generator.py b/grc/python/Generator.py
index 9bafeb0683..45958ba19b 100644
--- a/grc/python/Generator.py
+++ b/grc/python/Generator.py
@@ -35,7 +35,7 @@ class Generator(object):
         """
         Initialize the generator object.
         Determine the file to generate.
-        
+
         Args:
             flow_graph: the flow graph object
             file_path: the path to write the file to
@@ -74,7 +74,7 @@ Add a Misc->Throttle block to your flow graph to avoid CPU congestion.''')
     def get_popen(self):
         """
         Execute this python flow graph.
-        
+
         Returns:
             a popen object
         """
@@ -99,7 +99,7 @@ Add a Misc->Throttle block to your flow graph to avoid CPU congestion.''')
     def __str__(self):
         """
         Convert the flow graph to python code.
-        
+
         Returns:
             a string of python code
         """
@@ -147,7 +147,7 @@ Add a Misc->Throttle block to your flow graph to avoid CPU congestion.''')
             'flow_graph': self._flow_graph,
             'variables': variables,
             'parameters': parameters,
-                        'monitors': monitors,
+            'monitors': monitors,
             'blocks': blocks,
             'connections': connections,
             'messages': messages,
diff --git a/grc/python/flow_graph.tmpl b/grc/python/flow_graph.tmpl
index e1b091612b..52582384aa 100644
--- a/grc/python/flow_graph.tmpl
+++ b/grc/python/flow_graph.tmpl
@@ -161,6 +161,9 @@ gr.io_signaturev($(len($io_sigs)), $(len($io_sigs)), [$(', '.join($size_strs))])
         $indent($blk.get_make())
     #else
         self.$blk.get_id() = $indent($blk.get_make())
+        #if $blk.has_param('alias') and $blk.get_param('alias').get_evaluated()
+        (self.$blk.get_id()).set_block_alias("$blk.get_param('alias').get_evaluated()")
+        #end if
         #if $blk.has_param('affinity') and $blk.get_param('affinity').get_evaluated()
         (self.$blk.get_id()).set_processor_affinity($blk.get_param('affinity').get_evaluated())
         #end if
@@ -329,7 +332,11 @@ if __name__ == '__main__':
         tb.wait()
     qapp.connect(qapp, Qt.SIGNAL("aboutToQuit()"), quitting)
         #for $m in $monitors
-    (tb.$m.get_id()).start()
+    if $m.has_param('en'):
+        if $m.get_param('en').get_value():
+            (tb.$m.get_id()).start()
+    else:
+        sys.stderr.write("Monitor '{0}' does not have an enable ('en') parameter.".format("tb.$m.get_id()"))
         #end for
     qapp.exec_()
     tb = None #to clean up Qt widgets
@@ -360,4 +367,3 @@ if __name__ == '__main__':
     tb.wait()
     #end if
 #end if
-