Index: editor_mouse.cc
===================================================================
--- editor_mouse.cc	(revision 5448)
+++ editor_mouse.cc	(working copy)
@@ -1591,7 +1591,12 @@
 	case TempoBarItem:
 	case MarkerBarItem:
 		if (is_drawable()) {
-			track_canvas->get_window()->set_cursor (*current_canvas_cursor);
+			//std::cout << track_canvas << " " << current_canvas_cursor << std::endl;
+			if(current_canvas_cursor){
+				track_canvas->get_window()->set_cursor (*current_canvas_cursor);
+			} else {
+				std::cout << "current_canvas_cursor null" <<std::endl;
+			}	
 		}
 		break;
 		
Index: editor.cc
===================================================================
--- editor.cc	(revision 5448)
+++ editor.cc	(working copy)
@@ -361,6 +361,7 @@
 	_edit_point = EditAtMouse;
 	_internal_editing = false;
 	current_canvas_cursor = 0;
+	
 
 	frames_per_unit = 2048; /* too early to use reset_zoom () */
 	reset_hscrollbar_stepping ();
@@ -470,6 +471,9 @@
 	edit_hscrollbar.set_name ("EditorHScrollbar");
 
 	build_cursors ();
+	// since cursors have now been built set the current
+	current_canvas_cursor = selector_cursor;
+
 	setup_toolbar ();
 	setup_midi_toolbar ();