@@ -195,11 +195,11 @@
     l_offset=ftell(fp); l_size=j;
     if(i>4 && nam[i-4]=='.' && nam[i-3]=='W' && nam[i-1]=='V' && (nam[i-2]=='A' || nam[i-2]=='Z')) {
       j=nam[i-2];
       nam[i-4]=0;
       if(is_user) {
-        if(nusersounds>0x03FD) goto done;
+        if(nusersounds>255) goto done;
         i=nusersounds++;
         usersounds=realloc(usersounds,nusersounds*sizeof(WaveSound));
         user_sound_names=realloc(user_sound_names,nusersounds*sizeof(Uint8*));
         if(!usersounds || !user_sound_names) fatal("Allocation failed\n");
         user_sound_names[i]=strdup(nam);
@@ -408,11 +408,11 @@
   if(main_options['T'] && main_options['v']) {
     if(mmltuning) printf("mmltempo=%d; mmlvolume=%d; mmltuning[96]=%d\n",(int)mmltempo,(int)mmlvolume,(int)mmltuning[96]);
     for(i=0;i<nusersounds;i++) printf("%d: %s (ptr=%p, len=%d bytes)\n",i,user_sound_names[i],usersounds[i].data,usersounds[i].len);
     fflush(stdout);
   }
-  if(!screen) return;
+  if(!screen || !sound_on) return;
   nitems=nstandardsounds+nusersounds+8;
   columns=(screen->w-16)/240?:1;
   scrmax=(nitems+columns-1)/columns;
   set_cursor(XC_arrow);
   redraw: