From 06ddbce069b64d4e5471665eceb36292bb38cb8f Mon Sep 17 00:00:00 2001
From: Boram Bae <boram21.bae@samsung.com>
Date: Wed, 20 Jul 2022 10:38:46 +0900
Subject: [PATCH] Stop the engine before destroying the surface (#315)

* This fixes the crash that occurs when terminating flutter-tizen app

Signed-off-by: Boram Bae <boram21.bae@samsung.com>
---
 shell/platform/tizen/flutter_tizen_engine.cc | 1 +
 shell/platform/tizen/flutter_tizen_view.cc   | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/shell/platform/tizen/flutter_tizen_engine.cc b/shell/platform/tizen/flutter_tizen_engine.cc
index 7700d93c17d81..997a6015e957a 100644
--- a/shell/platform/tizen/flutter_tizen_engine.cc
+++ b/shell/platform/tizen/flutter_tizen_engine.cc
@@ -267,6 +267,7 @@ bool FlutterTizenEngine::StopEngine() {
     tizen_vsync_waiter_.reset();
 #endif
     FlutterEngineResult result = embedder_api_.Shutdown(engine_);
+    view_ = nullptr;
     engine_ = nullptr;
     return (result == kSuccess);
   }
diff --git a/shell/platform/tizen/flutter_tizen_view.cc b/shell/platform/tizen/flutter_tizen_view.cc
index 3359f7ffb4f66..50cfb734fac4a 100644
--- a/shell/platform/tizen/flutter_tizen_view.cc
+++ b/shell/platform/tizen/flutter_tizen_view.cc
@@ -54,6 +54,9 @@ FlutterTizenView::FlutterTizenView(std::unique_ptr<TizenViewBase> tizen_view)
 }
 
 FlutterTizenView::~FlutterTizenView() {
+  if (engine_) {
+    engine_->StopEngine();
+  }
   DestroyRenderSurface();
 }