X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fbinfolder.C;h=e8a8411d0d0b1dfaee797cfa59222b6bbf8056be;hp=ffe5a12f9484548a3a2aabcfab901e3236f0dde9;hb=a19a685a46ddc630010788707d9e5b9d2342af46;hpb=7e5a0760f40ff787cc3d93cb7768a901ebe52809

diff --git a/cinelerra-5.1/cinelerra/binfolder.C b/cinelerra-5.1/cinelerra/binfolder.C
index ffe5a12f..e8a8411d 100644
--- a/cinelerra-5.1/cinelerra/binfolder.C
+++ b/cinelerra-5.1/cinelerra/binfolder.C
@@ -347,14 +347,14 @@ int BinFolder::add_patterns(ArrayList<Indexable*> *drag_idxbls, int use_basename
 	for( int i=0; i<n; ++i ) {
 		idxbl = drag_idxbls->get(i);
 		if( !idxbl->is_asset &&
-		    idxbl->awindow_folder == AW_PROXY_FOLDER )
+		    idxbl->folder_no == AW_PROXY_FOLDER )
 			continue;
 
 		const char *tp = idxbl->get_title();
 		if( use_basename && idxbl->is_asset ) {
 			const char *cp = strrchr(tp, '/');
 			if( cp ) tp = cp + 1;
-			len += 2;  // "*/" + fn
+			len += 1;  // "*" + fn
 		}
 		len += strlen(tp) + 1;
 	}
@@ -363,14 +363,14 @@ int BinFolder::add_patterns(ArrayList<Indexable*> *drag_idxbls, int use_basename
 	for( int i=0; i<n; ++i ) {
 		idxbl = drag_idxbls->get(i);
 		if( !idxbl->is_asset &&
-		    idxbl->awindow_folder == AW_PROXY_FOLDER )
+		    idxbl->folder_no == AW_PROXY_FOLDER )
 			continue;
 		if( i > 0 ) *bp++ = '\n';
 		const char *tp = idxbl->get_title();
 		if( use_basename && idxbl->is_asset ) {
 			const char *cp = strrchr(tp, '/');
 			if( cp ) tp = cp + 1;
-			*bp++ = '*';  *bp++ = '/';
+			*bp++ = '*';
 		}
 		while( *tp ) *bp++ = *tp++;
 	}
@@ -522,14 +522,14 @@ int BinFolderFilter::load_xml(FileXML *file)
 	int enabled_type = file->tag.get_property("ENABLED", FOLDER_ENABLED_AND);
 	int op_type = file->tag.get_property("OP", FOLDER_OP_MATCHES);
 	int target_type = file->tag.get_property("TARGET", FOLDER_TARGET_PATTERNS);
-	char data[0x40000];
-	file->read_text_until("/FILTER", data, sizeof(data), 0);
+	XMLBuffer data;
+	file->read_text_until("/FILTER", &data, 0);
 	update_enabled(enabled_type);
 	update_target(target_type);
 	update_op(op_type);
 	target->load_xml(file);
 	if( target->type == FOLDER_TARGET_PATTERNS )
-		((BinFolderTargetPatterns *)target)->update(data);
+		((BinFolderTargetPatterns *)target)->update(data.cstr());
 	return 0;
 }