X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fawindowgui.C;h=186dcc5b5b0efdb94c4b291de371d334c716ee55;hp=19330e92051af647f0ca7ab156b0828ec70f9144;hb=9058f65f71aafbeab023657be0f6b84b629b70c4;hpb=559af27994c49da1d98e085f4ac2ec1ad1d1d27c

diff --git a/cinelerra-5.1/cinelerra/awindowgui.C b/cinelerra-5.1/cinelerra/awindowgui.C
index 19330e92..186dcc5b 100644
--- a/cinelerra-5.1/cinelerra/awindowgui.C
+++ b/cinelerra-5.1/cinelerra/awindowgui.C
@@ -1426,11 +1426,13 @@ void AWindowGUI::create_label_folder()
 
 void AWindowGUI::update_asset_list()
 {
+	ArrayList<AssetPicon *> new_assets;
 	for( int i = 0; i < assets.total; i++ ) {
 		AssetPicon *picon = (AssetPicon*)assets.values[i];
 		picon->in_use = 0;
 	}
 
+	mwindow->gui->lock_window("AWindowGUI::update_asset_list");
 // Synchronize EDL clips
 	for( int i=0; i<mwindow->edl->clips.size(); ++i ) {
 		int exists = 0;
@@ -1451,8 +1453,7 @@ void AWindowGUI::update_asset_list()
 		if( !exists ) {
 			AssetPicon *picon = new AssetPicon(mwindow,
 				this, mwindow->edl->clips[i]);
-			picon->create_objects();
-			assets.append(picon);
+			new_assets.append(picon);
 		}
 	}
 
@@ -1475,15 +1476,10 @@ void AWindowGUI::update_asset_list()
 		if( !exists ) {
 			AssetPicon *picon = new AssetPicon(mwindow,
 				this, current);
-			picon->create_objects();
-			assets.append(picon);
+			new_assets.append(picon);
 		}
 	}
 
-	mwindow->gui->lock_window("AWindowGUI::update_asset_list");
-	mwindow->gui->default_message();
-	mwindow->gui->unlock_window();
-
 // Synchronize nested EDLs
 	for( int i=0; i<mwindow->edl->nested_edls.size(); ++i ) {
 		int exists = 0;
@@ -1504,10 +1500,20 @@ void AWindowGUI::update_asset_list()
 		if( !exists ) {
 			AssetPicon *picon = new AssetPicon(mwindow,
 				this, (Indexable*)nested_edl);
-			picon->create_objects();
-			assets.append(picon);
+			new_assets.append(picon);
 		}
 	}
+	mwindow->gui->unlock_window();
+
+	for( int i=0; i<new_assets.size(); ++i ) {
+		AssetPicon *picon = new_assets[i];
+		picon->create_objects();
+		assets.append(picon);
+	}
+
+	mwindow->gui->lock_window();
+	mwindow->gui->default_message();
+	mwindow->gui->unlock_window();
 
 	for( int i = assets.size() - 1; i >= 0; i-- ) {
 		AssetPicon *picon = (AssetPicon*)assets.get(i);
@@ -1660,7 +1666,7 @@ void AWindowGUI::copy_picons(ArrayList<BC_ListBoxItem*> *dst,
 			if( picon->edl )
 				dst[1].append(item2 = new BC_ListBoxItem(picon->edl->local_session->clip_notes));
 			else
-			if( picon->label && picon->label->textstr )
+			if( picon->label )
 				dst[1].append(item2 = new BC_ListBoxItem(picon->label->textstr));
 			else if( picon->mtime ) {
 				char date_time[BCSTRLEN];