Imported Upstream version 11.5

1 files changed, 10 insertions, 12 deletions

diff --git a/snd-file.c b/snd-file.c
index d1881e4..b24bcdc 100644
--- a/snd-file.c
+++ b/snd-file.c
@@ -7,8 +7,6 @@
 #endif
 
 
-/* TODO: show listener from menu sometimes doesn't open the listener pane */
-
 
 /* -------------------------------- basic file attributes -------------------------------- */
 
@@ -669,6 +667,8 @@ static int default_sound_file_extensions = 0;
 static void add_sound_file_extension(const char *ext)
 {
   int i;
+  if ((!ext) || (!(*ext))) return;
+
   for (i = 0; i < sound_file_extensions_end; i++)
     if (strcmp(ext, sound_file_extensions[i]) == 0)
       return;
@@ -4638,14 +4638,13 @@ static XEN g_view_files_dialog(XEN managed, XEN make_new)
 static XEN g_add_directory_to_view_files_list(XEN directory, XEN dialog) 
 {
   #define H_add_directory_to_view_files_list "(" S_add_directory_to_view_files_list " dir :optional w): adds any sound files in 'dir' to the View:Files dialog"
+  
   XEN_ASSERT_TYPE(XEN_STRING_P(directory), directory, XEN_ARG_1, S_add_directory_to_view_files_list, "a string");
+  XEN_ASSERT_TYPE(XEN_WIDGET_P(dialog) || XEN_NOT_BOUND_P(dialog), dialog, XEN_ARG_2, S_add_directory_to_view_files_list, "a view-files dialog widget"); 
+
   if (XEN_NOT_BOUND_P(dialog))
     view_files_add_directory(NULL_WIDGET, XEN_TO_C_STRING(directory));
-  else
-    {
-      XEN_ASSERT_TYPE(XEN_WIDGET_P(dialog), dialog, XEN_ARG_2, S_add_directory_to_view_files_list, "a view-files dialog widget"); 
-      view_files_add_directory((widget_t)(XEN_UNWRAP_WIDGET(dialog)), XEN_TO_C_STRING(directory));
-    }
+  else view_files_add_directory((widget_t)(XEN_UNWRAP_WIDGET(dialog)), XEN_TO_C_STRING(directory));
   return(directory);
 }
 
@@ -4654,17 +4653,16 @@ static XEN g_add_file_to_view_files_list(XEN file, XEN dialog)
 {
   #define H_add_file_to_view_files_list "(" S_add_file_to_view_files_list " file :optional w): adds file to the View:Files dialog's list"
   char *name = NULL;
+
   XEN_ASSERT_TYPE(XEN_STRING_P(file), file, XEN_ARG_1, S_add_file_to_view_files_list, "a string");
+  XEN_ASSERT_TYPE(XEN_WIDGET_P(dialog) || XEN_NOT_BOUND_P(dialog), dialog, XEN_ARG_2, S_add_file_to_view_files_list, "a view-files dialog widget"); 
+
   name = mus_expand_filename(XEN_TO_C_STRING(file));
   if (mus_file_probe(name))
     {
       if (XEN_NOT_BOUND_P(dialog))
 	view_files_add_file(NULL_WIDGET, name);
-      else
-	{
-	  XEN_ASSERT_TYPE(XEN_WIDGET_P(dialog), dialog, XEN_ARG_2, S_add_file_to_view_files_list, "a view-files dialog widget"); 
-	  view_files_add_file((widget_t)(XEN_UNWRAP_WIDGET(dialog)), name);
-	}
+      else view_files_add_file((widget_t)(XEN_UNWRAP_WIDGET(dialog)), name);
     }
   if (name) free(name);
   return(file);