- const char *folder = file->tag.get_property("FOLDER");
- if( folder ) {
- awindow_folder = AWindowGUI::folder_number(folder);
- if( awindow_folder < 0 ) awindow_folder = AW_MEDIA_FOLDER;
- }
- awindow_folder = file->tag.get_property("AWINDOW_FOLDER", awindow_folder);
+ int awindow_folder = file->tag.get_property("AWINDOW_FOLDER", -1);
+ folder = awindow_folder >= 0 ? awindow_folder :
+ file->tag.get_property("FOLDER",
+ edl->parent_edl ? AW_CLIP_FOLDER : AW_MEDIA_FOLDER);