aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIOhannes m zmölnig <zmoelnig@users.sourceforge.net>2011-08-12 18:27:49 +0000
committerIOhannes m zmölnig <zmoelnig@users.sourceforge.net>2011-08-12 18:27:49 +0000
commit8c0cfa57e4bbc53380f02ebee2e1e1eed6eba98b (patch)
treee82a345a4c00b90235f3bc4b52381c48044501d0
parent2f22a4dde125743ed0ed5f57ef33573cfc4940e2 (diff)
check for NULL-pointer (as suggested by jamie bullock)
svn path=/trunk/externals/iem/mediasettings/; revision=15212
-rw-r--r--midisettings.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/midisettings.c b/midisettings.c
index 4f34b24..492ad8d 100644
--- a/midisettings.c
+++ b/midisettings.c
@@ -273,7 +273,7 @@ static void ms_params_get(t_ms_params*parms) {
parms->num_indev =(indevs >0)?indevs:0;
parms->num_outdev=(outdevs>0)?outdevs:0;
- // ms_params_print(parms);
+ // ms_params_print(parms);
}
@@ -322,7 +322,10 @@ static void midisettings_listdevices_devices(t_outlet *outlet,
dummy[MAXPDSTRING-1]=0;
devname=dummy;
} else {
- devname=ms_symkeys_getname(devices, i)->s_name;
+ t_symbol *s_devname=ms_symkeys_getname(devices, i);
+ if(s_devname) {
+ devname=s_devname->s_name;
+ }
}
if(devname) {
SETSYMBOL(atoms+count+1, gensym(devname));
@@ -422,7 +425,7 @@ static void midisettings_params_apply(t_midisettings*x) {
int alsamidi=(API_ALSA==sys_midiapi);
t_atom argv [MIDIDIALOG_INDEVS+MIDIDIALOG_OUTDEVS+2];
- int argc= MIDIDIALOG_INDEVS+MIDIDIALOG_OUTDEVS+2;
+ unsigned int argc= MIDIDIALOG_INDEVS+MIDIDIALOG_OUTDEVS+2;
unsigned int i=0;