From 7b63e5d2ceec2b47dce8524073e96fce50a944c5 Mon Sep 17 00:00:00 2001
From: omigamedev <omarator@gmail.com>
Date: Sun, 17 Nov 2019 17:57:09 +0100
Subject: [PATCH] animated layer merge warning, fix timeline update on document
 open

---
 src/app_layout.cpp | 13 ++++++++++---
 src/canvas.cpp     |  9 ++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/app_layout.cpp b/src/app_layout.cpp
index ca817d3..16f149d 100644
--- a/src/app_layout.cpp
+++ b/src/app_layout.cpp
@@ -1206,10 +1206,17 @@ void App::init_menu_layer()
 
             popup->find<NodeButtonCustom>("layer-merge")->on_click = [this, popup](Node*) {
                 //layers->get_child_index(layers->)
-                int current_idx_order = Canvas::I->m_current_layer_idx;
-                if (current_idx_order > 0)
+                if (Canvas::I->anim_duration() > 1)
                 {
-                    layers->merge(current_idx_order, current_idx_order - 1, true);
+                    message_box("Not supported", "Merging animated layers is not supported yet.");
+                }
+                else
+                {
+                    int current_idx_order = Canvas::I->m_current_layer_idx;
+                    if (current_idx_order > 0)
+                    {
+                        layers->merge(current_idx_order, current_idx_order - 1, true);
+                    }
                 }
                 popup->mouse_release();
                 popup->destroy();
diff --git a/src/canvas.cpp b/src/canvas.cpp
index 7b55fe1..5f44d7f 100644
--- a/src/canvas.cpp
+++ b/src/canvas.cpp
@@ -2560,9 +2560,12 @@ bool Canvas::project_open_thread(std::string file_path)
     if (App::I->layout.m_loaded)
     {
         pb->destroy();
-        App::I->title_update();
-        App::I->update_rec_frames();
-        App::I->animation->load_layers();
+        App::I->ui_task([] {
+            App::I->title_update();
+            App::I->update_rec_frames();
+            Canvas::I->anim_update();
+            App::I->animation->load_layers();
+        });
     }
     return true;
 }