no message

[moosique.git] / MooInstrumentList.java

diff --git a/MooInstrumentList.java b/MooInstrumentList.java
index 34ff4da07a041ad8ac6e6af8142803c9ce038f9c..91f8eea239733139899db97a5401ed8b585f978b 100644 (file)
--- 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) {}
        }
 
        /**