Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
===================================================================
diff -u -r11be58369c919ae40d1329129fdb6c2dabe27c45 -r52c43a34d2db89ffb51e5f19119b700cdb23a6dc
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	(.../CanvasBranchView.as)	(revision 11be58369c919ae40d1329129fdb6c2dabe27c45)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	(.../CanvasBranchView.as)	(revision 52c43a34d2db89ffb51e5f19119b700cdb23a6dc)
@@ -30,6 +30,7 @@
 import org.lamsfoundation.lams.common.dict.*;
 import org.lamsfoundation.lams.common.mvc.*;
 import org.lamsfoundation.lams.common.CommonCanvasView;
+import org.lamsfoundation.lams.common.ApplicationParent;
 import org.lamsfoundation.lams.monitoring.mv.MonitorModel;
 import org.lamsfoundation.lams.monitoring.mv.MonitorController;
 
@@ -675,21 +676,16 @@
 	 */
 	public function getController():Object {
 		var c:Controller = super.getController();
-	/*	Debugger.log("ApplicationParent.module: "+ApplicationParent.module, Debugger.CRITICAL,'getController','CanvasBranchView');
-		if (ApplicationParent.module == "monitoring") {
-			Debugger.log("We are in the montioring module", Debugger.CRITICAL,'getController','CanvasBranchView');
+		
+		if(model instanceof CanvasModel) {
+			Debugger.log("canvas controller: " + c, Debugger.CRITICAL,'getController','CanvasBranchView');
+			return CanvasController(c);
+		} else {
+			Debugger.log("monitor controller: " + c, Debugger.CRITICAL,'getController','CanvasBranchView');
 			return MonitorController(c);
 		}
-		else if (ApplicationParent.module == "authoring") {
-			Debugger.log("We are in the montioring module", Debugger.CRITICAL,'getController','CanvasBranchView');
-			return CanvasController(c);
-		}
-		else {
-			Debugger.log("Unkown module", Debugger.CRITICAL,'getController','CanvasBranchView');
-			return null;
-		}*/
 
-		return (c instanceof CanvasController) ? CanvasController(c) : MonitorController(c);
+		//return (c instanceof CanvasController) ? CanvasController(c) : MonitorController(c);
 	}
 	
 	/**