--- jsampler/trunk/src/org/jsampler/view/fantasia/SmallChannelView.java	2008/05/04 18:40:13	1734
+++ jsampler/trunk/src/org/jsampler/view/fantasia/SmallChannelView.java	2008/05/04 18:58:16	1735
@@ -87,8 +87,6 @@
 		this.channel = channel;
 		this.channelOptionsView = channelOptionsView;
 		
-		addMouseListener(channel.getContextMenu());
-		
 		screen = new ChannelScreen(channel);
 		
 		btnPower = new Channel.PowerButton(channel);
@@ -156,11 +154,13 @@
 				screen.updateVolumeInfo();
 			}
 		});
+		
+		addEnhancedMouseListener(channel.getContextMenu());
 	}
 	
 	public void
 	uninstallView() {
-		
+		//removeEnhancedMouseListener(channel.getContextMenu());
 	}
 	
 	public ChannelOptionsView
@@ -336,8 +336,6 @@
 			
 			this.channel = channel;
 			
-			addMouseListener(channel.getContextMenu());
-			
 			streamVoiceCountPane = new Channel.StreamVoiceCountPane(channel);
 			components.add(streamVoiceCountPane);
 			
@@ -360,7 +358,6 @@
 			btnInstr.setRolloverEnabled(false);
 			btnInstr.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
 			btnInstr.setHorizontalAlignment(btnInstr.LEFT);
-			btnInstr.addMouseListener(channel.getContextMenu());
 			
 			int h = btnInstr.getPreferredSize().height;
 			btnInstr.setPreferredSize(new Dimension(100, h));