fix awdw solo vicon crash, fix nested clip for binfolders, open edit edl

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / binfolder.C

diff --git a/cinelerra-5.1/cinelerra/binfolder.C b/cinelerra-5.1/cinelerra/binfolder.C
index 4dfc2f89a2145e7d5cfa08c69010b68e2e546952..ff4d0ba6a940e1d42aaa3d3d85f6daa58c1958ba 100644 (file)
--- a/cinelerra-5.1/cinelerra/binfolder.C
+++ b/cinelerra-5.1/cinelerra/binfolder.C
@@ -393,8 +393,8 @@ double BinFolders::matches_indexable(int folder, Indexable *idxbl)
        BinFolder *bin_folder = 0;
        while( --k>=0 && (bin_folder=get(k)) && bin_folder->awindow_folder!=folder );
        if( k < 0 ) return -1;
-       if( bin_folder->is_clips && idxbl->is_asset ) return -1;
-       if( !bin_folder->is_clips && !idxbl->is_asset ) return -1;
+       if( bin_folder->is_clips && idxbl->folder_no != AW_CLIP_FOLDER ) return -1;
+       if( !bin_folder->is_clips && idxbl->folder_no != AW_MEDIA_FOLDER ) return -1;
        return bin_folder->matches_indexable(idxbl);
 }