From 20e53b92d93df8fe3c3b99c9134f992b156330db Mon Sep 17 00:00:00 2001 From: Good Guy Date: Thu, 20 Dec 2018 20:20:24 -0700 Subject: [PATCH] fix for title color in old edl xml, fix default edit popup color value --- cinelerra-5.1/cinelerra/edit.C | 2 +- cinelerra-5.1/cinelerra/editpopup.C | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cinelerra-5.1/cinelerra/edit.C b/cinelerra-5.1/cinelerra/edit.C index e40b8c18..fc36b187 100644 --- a/cinelerra-5.1/cinelerra/edit.C +++ b/cinelerra-5.1/cinelerra/edit.C @@ -406,7 +406,7 @@ int Edit::load_properties(FileXML *file, int64_t &startproject) length = file->tag.get_property("LENGTH", (int64_t)0); hard_left = file->tag.get_property("HARD_LEFT", (int64_t)0); hard_right = file->tag.get_property("HARD_RIGHT", (int64_t)0); - color = file->tag.get_property("COLOR", (int64_t)-1); + color = file->tag.get_property("COLOR", 0); group_id = file->tag.get_property("GROUP_ID", group_id); user_title[0] = 0; file->tag.get_property("USER_TITLE", user_title); diff --git a/cinelerra-5.1/cinelerra/editpopup.C b/cinelerra-5.1/cinelerra/editpopup.C index f48f0564..34aadc46 100644 --- a/cinelerra-5.1/cinelerra/editpopup.C +++ b/cinelerra-5.1/cinelerra/editpopup.C @@ -441,7 +441,7 @@ EditTitleColorDefault::EditTitleColorDefault( int EditTitleColorDefault::handle_event() { - const int color = 0, alpha = 0; + const int color = 0, alpha = 0xff; color_picker->color = color | (~alpha << 24); color_picker->update_gui(color, alpha); return 1; -- 2.26.2