From 1db422ae78d440e2e01ed8c10e89ab88511b5832 Mon Sep 17 00:00:00 2001
From: omigamedev <omarator@gmail.com>
Date: Wed, 13 Mar 2019 11:36:20 +0100
Subject: [PATCH] disable crash menu, fix export layers

---
 data/layout.xml | 2 ++
 src/canvas.cpp  | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/data/layout.xml b/data/layout.xml
index 44b53a9..d7ec945 100644
--- a/data/layout.xml
+++ b/data/layout.xml
@@ -1480,10 +1480,12 @@ Here's a list of what's available in this release.
         <icon icon="bug" width="20"/>
         <text id="menu-label" text="What's new?" margin="0 0 0 5"/>
       </button-custom>
+      <!--
       <button-custom id="about-crash" height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
         <icon icon="bug" width="20"/>
         <text id="menu-label" text="Induce crash" margin="0 0 0 5"/>
       </button-custom>
+      -->
       <button-custom id="about-perf" height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
         <icon icon="bug" width="20"/>
         <text id="menu-label" text="Performance test" margin="0 0 0 5"/>
diff --git a/src/canvas.cpp b/src/canvas.cpp
index 6c16215..fed5a33 100644
--- a/src/canvas.cpp
+++ b/src/canvas.cpp
@@ -1560,6 +1560,8 @@ void Canvas::export_layers(std::string file_name, std::function<void()> on_compl
 
 void Canvas::export_layers_thread(std::string file_name)
 {
+    App::I.async_start();
+
     // save viewport and clear color states
     GLint vp[4];
     GLfloat cc[4];
@@ -1568,7 +1570,6 @@ void Canvas::export_layers_thread(std::string file_name)
     GLboolean blend = glIsEnabled(GL_BLEND);
 
     gl_state gl;
-    App::I.async_start();
     std::shared_ptr<NodeProgressBar> pb;
     if (App::I.layout.m_loaded)
     {
@@ -1709,13 +1710,14 @@ void Canvas::export_layers_thread(std::string file_name)
         pb->destroy();
         App::I.async_update();
     }
-    App::I.async_end();
 
     // restore viewport and clear color states
     blend ? glEnable(GL_BLEND) : glDisable(GL_BLEND);
     glViewport(vp[0], vp[1], vp[2], vp[3]);
     glClearColor(cc[0], cc[1], cc[2], cc[3]);
     glActiveTexture(GL_TEXTURE0);
+    
+    App::I.async_end();
 }
 
 void Canvas::export_cubes()