X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fbinfolder.C;h=f7be299a19a50f08deac6c01a3db5d4ea617bb5f;hb=f62d927a25cb3b02f2197fde99c77df3005d41a7;hp=4dfc2f89a2145e7d5cfa08c69010b68e2e546952;hpb=0df48ad2d876409c5beeae2e21933a728ea76c33;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/cinelerra/binfolder.C b/cinelerra-5.1/cinelerra/binfolder.C index 4dfc2f89..f7be299a 100644 --- 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); } @@ -1674,6 +1674,8 @@ NewFolderGUI::NewFolderGUI(NewFolderThread *thread, int x, int y, int w, int h) x, y, xS(w), yS(h), -1, -1, 0, 0, 1) { this->thread = thread; +// *** CONTEXT_HELP *** + context_help_set_keyword("User Folders"); } NewFolderGUI::~NewFolderGUI() @@ -1748,6 +1750,8 @@ ModifyFolderGUI::ModifyFolderGUI(ModifyFolderThread *thread, int x, int y, int w : BC_Window(_(PROGRAM_NAME ": Modify folder"), x, y, w, h, xS(320), yS(200), 1, 0, 1) { this->thread = thread; +// *** CONTEXT_HELP *** + context_help_set_keyword("User Folders"); } ModifyFolderGUI::~ModifyFolderGUI() @@ -1944,6 +1948,8 @@ ModifyTargetGUI::ModifyTargetGUI(ModifyTargetThread *thread, int allow_resize) -1, -1, allow_resize, 0, 1) { this->thread = thread; +// *** CONTEXT_HELP *** + context_help_set_keyword("User Folders"); } ModifyTargetGUI::~ModifyTargetGUI()