add bins/folders, fix listbox bad wdw ref, hide vicons fix, remove sort by time

[goodguy/history.git] / cinelerra-5.1 / cinelerra / edlsession.C

diff --git a/cinelerra-5.1/cinelerra/edlsession.C b/cinelerra-5.1/cinelerra/edlsession.C
index 9bdb6458192f00ed7811f44f43ef9db688fc8d45..1eb9b6b986752f07917ffba50b45a6bacb055746 100644 (file)
--- a/cinelerra-5.1/cinelerra/edlsession.C
+++ b/cinelerra-5.1/cinelerra/edlsession.C
@@ -241,7 +241,7 @@ int EDLSession::load_defaults(BC_Hash *defaults)
        ruler_x2 = defaults->get("RULER_X2", 0.0);
        ruler_y1 = defaults->get("RULER_Y1", 0.0);
        ruler_y2 = defaults->get("RULER_Y2", 0.0);
-       awindow_folder = defaults->get("AWINDOW_FOLDER", awindow_folder);
+       awindow_folder = defaults->get("AWINDOW_FOLDER", AW_MEDIA_FOLDER);
        cursor_on_frames = defaults->get("CURSOR_ON_FRAMES", 1);
        typeless_keyframes = defaults->get("TYPELESS_KEYFRAMES", 0);
        cwindow_dest = defaults->get("CWINDOW_DEST", 0);
@@ -609,13 +609,7 @@ int EDLSession::load_xml(FileXML *file,
                ruler_y1 = file->tag.get_property("RULER_Y1", ruler_y1);
                ruler_x2 = file->tag.get_property("RULER_X2", ruler_x2);
                ruler_y2 = file->tag.get_property("RULER_Y2", ruler_y2);
-               string[0] = 0;
-               file->tag.get_property("CURRENT_FOLDER", string);
-               if( string[0] ) {
-                       awindow_folder = AWindowGUI::folder_number(string);
-                       if( awindow_folder < 0 ) awindow_folder = AW_MEDIA_FOLDER;
-               }
-               file->tag.get_property("AWINDOW_FOLDER", awindow_folder);
+               awindow_folder = file->tag.get_property("AWINDOW_FOLDER", AW_MEDIA_FOLDER);
                cursor_on_frames = file->tag.get_property("CURSOR_ON_FRAMES", cursor_on_frames);
                typeless_keyframes = file->tag.get_property("TYPELESS_KEYFRAMES", typeless_keyframes);
                cwindow_dest = file->tag.get_property("CWINDOW_DEST", cwindow_dest);