X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Flocalsession.C;h=9556dce3d6ebd693e6b3d5dde01230e6d552d179;hp=bb95fafa1c40aeadb6739bb8dc8d491005e54d80;hb=2e48b660e37eb5c661264d601211e16cb6cd6e89;hpb=a95193c3fd88733d184f2d460eca1fe6ddf8af28

diff --git a/cinelerra-5.1/cinelerra/localsession.C b/cinelerra-5.1/cinelerra/localsession.C
index bb95fafa..9556dce3 100644
--- a/cinelerra-5.1/cinelerra/localsession.C
+++ b/cinelerra-5.1/cinelerra/localsession.C
@@ -60,7 +60,6 @@ LocalSession::LocalSession(EDL *edl)
 
 	selectionstart = selectionend = 0;
 	in_point = out_point = -1;
-	folder = AW_CLIP_FOLDER;
 	sprintf(clip_title, _("Program"));
 	strcpy(clip_notes, _("Hello world"));
 	strcpy(clip_icon, "");
@@ -119,7 +118,6 @@ void LocalSession::copy_from(LocalSession *that)
 	strcpy(clip_title, that->clip_title);
 	strcpy(clip_notes, that->clip_notes);
 	strcpy(clip_icon, that->clip_icon);
-	folder = that->folder;
 	in_point = that->in_point;
 	loop_playback = that->loop_playback;
 	loop_start = that->loop_start;
@@ -169,7 +167,6 @@ 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("FOLDER", folder);
 	file->tag.set_property("X_PANE", x_pane);
 	file->tag.set_property("Y_PANE", y_pane);
 
@@ -265,10 +262,6 @@ void LocalSession::load_xml(FileXML *file, unsigned long load_flags)
 					year, mon, mday, hour, min, sec);
 			}
 		}
-		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);
@@ -329,8 +322,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);
 		}
 	}
 }