X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fclippopup.C;h=4027b8190a148b75898b637e4ca89820fd40d7d4;hp=df439311dc32d95819f75335a8f11b0db4cad808;hb=2e48b660e37eb5c661264d601211e16cb6cd6e89;hpb=08284a3a20b2cc8606dd90c3c147e2c31d301a61

diff --git a/cinelerra-5.1/cinelerra/clippopup.C b/cinelerra-5.1/cinelerra/clippopup.C
index df439311..4027b819 100644
--- a/cinelerra-5.1/cinelerra/clippopup.C
+++ b/cinelerra-5.1/cinelerra/clippopup.C
@@ -175,7 +175,7 @@ ClipPopupSort::~ClipPopupSort()
 
 int ClipPopupSort::handle_event()
 {
-	mwindow->awindow->gui->sort_assets(0);
+	mwindow->awindow->gui->sort_assets();
 	return 1;
 }
 
@@ -444,7 +444,7 @@ int ClipPopupNest::handle_event()
 		EDL *clip = mwindow->session->drag_clips->values[0];
 		EDL *nested = edl->new_nested(clip, path);
 		EDL *new_clip = edl->create_nested_clip(nested);
-		new_clip->awindow_folder = AW_CLIP_FOLDER;
+		new_clip->folder_no = AW_CLIP_FOLDER;
                 sprintf(new_clip->local_session->clip_icon,
                         "clip_%02d%02d%02d-%02d%02d%02d.png",
                         dtm.tm_year+1900, dtm.tm_mon+1, dtm.tm_mday,
@@ -502,7 +502,7 @@ int ClipPopupUnNest::handle_event()
 			EDL *new_clip = new EDL(edl);
 			new_clip->create_objects();
 			new_clip->copy_all(nested_edl);
-			new_clip->awindow_folder = AW_CLIP_FOLDER;
+			new_clip->folder_no = AW_CLIP_FOLDER;
 			int idx = edl->clips.number_of(clip);
 			if( idx >= 0 ) {
 				edl->clips[idx] = new_clip;