summaryrefslogtreecommitdiffstats
path: root/screen_ui.cpp
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2018-06-06 16:38:54 +0200
committerTao Bao <tbao@google.com>2018-06-06 16:49:47 +0200
commit94371fd012c661859326b73246b781ae872e0871 (patch)
treead3b819f9fbf7d911052d1ca507e9cd4cab34815 /screen_ui.cpp
parentMerge "tests: Specify the death test style to avoid flakiness." (diff)
downloadandroid_bootable_recovery-94371fd012c661859326b73246b781ae872e0871.tar
android_bootable_recovery-94371fd012c661859326b73246b781ae872e0871.tar.gz
android_bootable_recovery-94371fd012c661859326b73246b781ae872e0871.tar.bz2
android_bootable_recovery-94371fd012c661859326b73246b781ae872e0871.tar.lz
android_bootable_recovery-94371fd012c661859326b73246b781ae872e0871.tar.xz
android_bootable_recovery-94371fd012c661859326b73246b781ae872e0871.tar.zst
android_bootable_recovery-94371fd012c661859326b73246b781ae872e0871.zip
Diffstat (limited to '')
-rw-r--r--screen_ui.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/screen_ui.cpp b/screen_ui.cpp
index b9aba807d..b4ef054ce 100644
--- a/screen_ui.cpp
+++ b/screen_ui.cpp
@@ -173,7 +173,9 @@ ScreenRecoveryUI::ScreenRecoveryUI(bool scrollable_menu)
ScreenRecoveryUI::~ScreenRecoveryUI() {
progress_thread_stopped_ = true;
- progress_thread_.join();
+ if (progress_thread_.joinable()) {
+ progress_thread_.join();
+ }
}
GRSurface* ScreenRecoveryUI::GetCurrentFrame() const {