X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fasset.C;h=4f911e984d544803057547946beb7b9de4ddd55e;hp=4b42feff174dc601e3ceef53908c89d335158b0e;hb=HEAD;hpb=b9f98da8f1cd8b7b31ead02fa41f299b56cac3da

diff --git a/cinelerra-5.1/cinelerra/asset.C b/cinelerra-5.1/cinelerra/asset.C
index 4b42feff..4f911e98 100644
--- a/cinelerra-5.1/cinelerra/asset.C
+++ b/cinelerra-5.1/cinelerra/asset.C
@@ -190,7 +190,7 @@ void Asset::copy_from(Asset *asset, int do_index)
 void Asset::copy_location(Asset *asset)
 {
 	strcpy(path, asset->path);
-	awindow_folder = asset->awindow_folder;
+	folder_no = asset->folder_no;
 }
 
 void Asset::copy_format(Asset *asset, int do_index)
@@ -459,9 +459,7 @@ int Asset::read(FileXML *file,
 			else
 			if(file->tag.title_is("FOLDER"))
 			{
-				const char *string = file->tag.get_property("NUMBER");
-				awindow_folder = string ? atoi(string) :
-					AWindowGUI::folder_number(file->read_text());
+				folder_no = file->tag.get_property("NUMBER", AW_MEDIA_FOLDER);
 			}
 			else
 			if(file->tag.title_is("VIDEO"))
@@ -579,7 +577,7 @@ int Asset::write(FileXML *file,
 	file->append_newline();
 
 	file->tag.set_title("FOLDER");
-	file->tag.set_property("NUMBER", awindow_folder);
+	file->tag.set_property("NUMBER", folder_no);
 	file->append_tag();
 	file->tag.set_title("/FOLDER");
 	file->append_tag();