X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fclippopup.C;h=6806848151c5551abcd0f38a2670a776aa7820aa;hb=3b781cd7b4b9c477e637adb876a229d2781ee33b;hp=ad1bdbcc8d4955495a6c9d3062a9c899c969278c;hpb=559af27994c49da1d98e085f4ac2ec1ad1d1d27c;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/clippopup.C b/cinelerra-5.1/cinelerra/clippopup.C
index ad1bdbcc..68068481 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;
 }
 
@@ -492,7 +492,9 @@ int ClipPopupUnNest::handle_event()
 		nested_edl = edit && !edit->next && !edit->asset ? edit->nested_edl : 0;
 		while( nested_edl && (track=track->next)!=0 ) {
 			Edit *edit = track->edits->first;
-			if( !edit || edit->next || edit->nested_edl != nested_edl )
+			if( !edit || edit->next ||
+			    ( edit->nested_edl != nested_edl &&
+			      strcmp(edit->nested_edl->path, nested_edl->path) ) )
 				nested_edl = 0;
 		}
 		if( nested_edl ) {