Index: editor.cc
===================================================================
--- editor.cc	(revision 8719)
+++ editor.cc	(working copy)
@@ -395,18 +395,21 @@
 	bbt_label.set_padding (5,0);
 	bbt_label.hide ();
 	bbt_label.set_no_show_all();
+	
 	minsec_label.set_name ("EditorTimeButton");
 	minsec_label.set_size_request (-1, (int)timebar_height);
 	minsec_label.set_alignment (1.0, 0.5);
 	minsec_label.set_padding (5,0);
 	minsec_label.hide ();
 	minsec_label.set_no_show_all();
+	
 	timecode_label.set_name ("EditorTimeButton");
 	timecode_label.set_size_request (-1, (int)timebar_height);
 	timecode_label.set_alignment (1.0, 0.5);
 	timecode_label.set_padding (5,0);
 	timecode_label.hide ();
 	timecode_label.set_no_show_all();
+	
 	samples_label.set_name ("EditorTimeButton");
 	samples_label.set_size_request (-1, (int)timebar_height);
 	samples_label.set_alignment (1.0, 0.5);
@@ -728,16 +731,18 @@
 {
 #ifdef WITH_CMT
 	if(image_socket_listener) {
+	  
 		if(image_socket_listener->is_connected())
 		{
 			image_socket_listener->close_connection() ;
 		}
 
 		delete image_socket_listener ;
+		
 		image_socket_listener = 0 ;
 	}
 #endif
-        
+
 	delete _routes;
 	delete _route_groups;
 	delete track_canvas;
@@ -1722,7 +1727,7 @@
 	}
 
 	if (_popup_region_menu_item == 0) {
-		_popup_region_menu_item = manage (new MenuItem (menu_item_name));
+		_popup_region_menu_item = new MenuItem (menu_item_name);
 		_popup_region_menu_item->set_submenu (*dynamic_cast<Menu*> (ActionManager::get_widget (X_("/PopupRegionMenu"))));
 		_popup_region_menu_item->show ();
 	} else {
@@ -1730,9 +1735,11 @@
 	}
 
 	edit_items.push_back (*_popup_region_menu_item);
+
 	if (multiple_regions_at_position && (layering_order_editor == 0 || !layering_order_editor->is_visible ())) {
 		edit_items.push_back (*manage (_region_actions->get_action ("choose-top-region")->create_menu_item ()));
 	}
+
 	edit_items.push_back (SeparatorElem());
 }