summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2018-06-14 03:40:22 +0200
committerandroid-build-merger <android-build-merger@google.com>2018-06-14 03:40:22 +0200
commit109de7ba7550b502f0a474dab0911c989333c24d (patch)
treee9095900229187af9049e0c660b56e005b46961c
parentMerge "Recovery image is self-contained" am: 397e8f2279 (diff)
parentMerge "screen_ui: Call gr_exit() from dtor." (diff)
downloadandroid_bootable_recovery-109de7ba7550b502f0a474dab0911c989333c24d.tar
android_bootable_recovery-109de7ba7550b502f0a474dab0911c989333c24d.tar.gz
android_bootable_recovery-109de7ba7550b502f0a474dab0911c989333c24d.tar.bz2
android_bootable_recovery-109de7ba7550b502f0a474dab0911c989333c24d.tar.lz
android_bootable_recovery-109de7ba7550b502f0a474dab0911c989333c24d.tar.xz
android_bootable_recovery-109de7ba7550b502f0a474dab0911c989333c24d.tar.zst
android_bootable_recovery-109de7ba7550b502f0a474dab0911c989333c24d.zip
-rw-r--r--screen_ui.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/screen_ui.cpp b/screen_ui.cpp
index b4ef054ce..e8444b6ca 100644
--- a/screen_ui.cpp
+++ b/screen_ui.cpp
@@ -176,6 +176,8 @@ ScreenRecoveryUI::~ScreenRecoveryUI() {
if (progress_thread_.joinable()) {
progress_thread_.join();
}
+ // No-op if gr_init() (via Init()) was not called or had failed.
+ gr_exit();
}
GRSurface* ScreenRecoveryUI::GetCurrentFrame() const {