diff options
author | Tao Bao <tbao@google.com> | 2018-06-06 18:41:52 +0200 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-06-06 18:41:52 +0200 |
commit | 2454b2493abbdc0cf591002d7dc1b32bafbdf032 (patch) | |
tree | ad3b819f9fbf7d911052d1ca507e9cd4cab34815 /screen_ui.cpp | |
parent | Merge "tests: Specify the death test style to avoid flakiness." (diff) | |
parent | ui: join only if joinable. (diff) | |
download | android_bootable_recovery-2454b2493abbdc0cf591002d7dc1b32bafbdf032.tar android_bootable_recovery-2454b2493abbdc0cf591002d7dc1b32bafbdf032.tar.gz android_bootable_recovery-2454b2493abbdc0cf591002d7dc1b32bafbdf032.tar.bz2 android_bootable_recovery-2454b2493abbdc0cf591002d7dc1b32bafbdf032.tar.lz android_bootable_recovery-2454b2493abbdc0cf591002d7dc1b32bafbdf032.tar.xz android_bootable_recovery-2454b2493abbdc0cf591002d7dc1b32bafbdf032.tar.zst android_bootable_recovery-2454b2493abbdc0cf591002d7dc1b32bafbdf032.zip |
Diffstat (limited to '')
-rw-r--r-- | screen_ui.cpp | 4 |
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 { |