X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Flocalsession.C;h=0ce537e25c2b78083c78656579b0cd63aa6225e2;hb=702161ddaf384a773831f1643fca0a54133625b2;hp=890ff0adceea4dd996aed3d3fab83deb1335e2ca;hpb=376dbcef804a17c74f0db851064e7947a3d0a5f5;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/localsession.C b/cinelerra-5.1/cinelerra/localsession.C
index 890ff0ad..0ce537e2 100644
--- a/cinelerra-5.1/cinelerra/localsession.C
+++ b/cinelerra-5.1/cinelerra/localsession.C
@@ -60,7 +60,7 @@ LocalSession::LocalSession(EDL *edl)
 
 	selectionstart = selectionend = 0;
 	in_point = out_point = -1;
-	awindow_folder = AW_CLIP_FOLDER;
+	folder = AW_CLIP_FOLDER;
 	sprintf(clip_title, _("Program"));
 	strcpy(clip_notes, _("Hello world"));
 	strcpy(clip_icon, "");
@@ -119,7 +119,7 @@ void LocalSession::copy_from(LocalSession *that)
 	strcpy(clip_title, that->clip_title);
 	strcpy(clip_notes, that->clip_notes);
 	strcpy(clip_icon, that->clip_icon);
-	awindow_folder = that->awindow_folder;
+	folder = that->folder;
 	in_point = that->in_point;
 	loop_playback = that->loop_playback;
 	loop_start = that->loop_start;
@@ -169,7 +169,7 @@ void LocalSession::save_xml(FileXML *file, double start)
 	file->tag.set_property("SELECTION_END", selectionend - start);
 	file->tag.set_property("CLIP_TITLE", clip_title);
 	file->tag.set_property("CLIP_ICON", clip_icon);
-	file->tag.set_property("AWINDOW_FOLDER", awindow_folder);
+	file->tag.set_property("FOLDER", folder);
 	file->tag.set_property("X_PANE", x_pane);
 	file->tag.set_property("Y_PANE", y_pane);
 
@@ -265,12 +265,10 @@ void LocalSession::load_xml(FileXML *file, unsigned long load_flags)
 					year, mon, mday, hour, min, sec);
 			}
 		}
-		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);
 		loop_playback = file->tag.get_property("LOOP_PLAYBACK", 0);
 		loop_start = file->tag.get_property("LOOP_START", (double)0);
 		loop_end = file->tag.get_property("LOOP_END", (double)0);
@@ -331,8 +329,10 @@ void LocalSession::load_xml(FileXML *file, unsigned long load_flags)
 	while( !file->read_tag() ) {
 		if( file->tag.title_is("/LOCALSESSION") ) break;
 		if( file->tag.title_is("CLIP_NOTES") ) {
-			file->read_text_until("/CLIP_NOTES",
-				clip_notes, sizeof(clip_notes)-1, 1);
+			XMLBuffer notes;
+			file->read_text_until("/CLIP_NOTES", &notes, 1);
+			memset(clip_notes, 0, sizeof(clip_notes));
+			strncpy(clip_notes, notes.cstr(), sizeof(clip_notes)-1);
 		}
 	}
 }