X-Git-Url: https://ruin.nu/git/?p=moosique.git;a=blobdiff_plain;f=MooInstrumentList.java;h=91f8eea239733139899db97a5401ed8b585f978b;hp=34ff4da07a041ad8ac6e6af8142803c9ce038f9c;hb=HEAD;hpb=1d2d2bfd14ba0addab97692527d4414d3a87e13d

diff --git a/MooInstrumentList.java b/MooInstrumentList.java
index 34ff4da..91f8eea 100644
--- a/MooInstrumentList.java
+++ b/MooInstrumentList.java
@@ -24,7 +24,7 @@ public class MooInstrumentList extends JComboBox implements ActionListener {
 	public MooInstrumentList(int chan, int listType, ShortMessage programMsg) {
 		super(instruments[listType]);
 		programChangeMessage = programMsg;
-		setSelectedIndex(programChangeMessage.getData1());
+		if (programChangeMessage != null) setSelectedIndex(programChangeMessage.getData1());
 		setChannel(chan);	
 		setFont(Moosique.getGUI().FONT);
 		addActionListener(this);
@@ -36,7 +36,7 @@ public class MooInstrumentList extends JComboBox implements ActionListener {
 	public void setChannel(int chan) {
 		channel = chan;
 		try {programChangeMessage.setMessage(programChangeMessage.getCommand(), chan, programChangeMessage.getData1(), 0);}
-		catch (InvalidMidiDataException e) {}
+		catch (Exception e) {}
 	}
 
 	/**