modify folder segv fix, opengl pbfr resource conflict fix

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

diff --git a/cinelerra-5.1/cinelerra/indexable.C b/cinelerra-5.1/cinelerra/indexable.C
index 1fff3eff0b842e47636ccea3fa9208cce00d5d91..2d32e1943fc84e45f9d0969b50fed0b6318c5e26 100644 (file)
--- a/cinelerra-5.1/cinelerra/indexable.C
+++ b/cinelerra-5.1/cinelerra/indexable.C
@@ -23,6 +23,7 @@
 #include "edl.h"
 #include "indexable.h"
 #include "language.h"
+#include "localsession.h"
 
 #include <string.h>
 
@@ -64,7 +65,7 @@ void Indexable::update_index(Indexable *src)
        if( index_state == src->index_state ) return;
        if( index_state ) index_state->remove_user();
        index_state = src->index_state;
-       index_state->add_user();
+       if( index_state ) index_state->add_user();
 }
 
 
@@ -73,6 +74,7 @@ void Indexable::update_index(Indexable *src)
 void Indexable::copy_indexable(Indexable *src)
 {
        if( this == src ) return;
+       awindow_folder = src->awindow_folder;
        update_path(src->path);
        update_index(src);
 }
@@ -112,8 +114,11 @@ int64_t Indexable::get_video_frames()
        return 0;
 }
 
-
-
-
-
+const char *Indexable::get_title()
+{
+       if( is_asset ) return path;
+       EDL *edl = (EDL*)this;
+       if( !edl->parent_edl || awindow_folder == AW_PROXY_FOLDER ) return path;
+       return edl->local_session->clip_title;
+}