X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=MooInstrumentList.java;h=ed976dd4434d952c614a113bc77030980b2d6855;hb=948e069926266ead58bc5466520e131941f2466c;hp=88903e039eb838360a771b3129d3201819052f74;hpb=f7c0dc0b216c60d93f722b040878a51399679fc2;p=moosique.git

diff --git a/MooInstrumentList.java b/MooInstrumentList.java
index 88903e0..ed976dd 100644
--- a/MooInstrumentList.java
+++ b/MooInstrumentList.java
@@ -6,7 +6,7 @@ import java.awt.event.*;
 /**
  * A Combo Box where the instrument of the currently active channel can be selected.
  * 
- * @author  Einar Pehrson
+ * @author  Einar Pehrson, Michael Andreen
  */
  
 public class MooInstrumentList extends JComboBox implements ActionListener {
@@ -14,15 +14,16 @@ public class MooInstrumentList extends JComboBox implements ActionListener {
 	protected int channel;
 	public MooInstrumentList(int chan) {
 		super(instruments);
-		setChannel(chan);
+		setChannel(chan);	
 		setFont(new Font("Helvetica", Font.PLAIN, 10));
 		addActionListener(this);
 	}
 
 	public void setChannel(int chan){
 		channel = chan;
-		setSelectedIndex(Moosique.getChannel(chan).getProgram());
+		setSelectedIndex(Moosique.getChannel(channel).getProgram());
 	}
+
 	public void actionPerformed(ActionEvent e) {
 		JComboBox box = (JComboBox)e.getSource();
 		int instrument = box.getSelectedIndex();