diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-06-08 11:36:01 +0200 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-06-08 11:36:01 +0200 |
| commit | 5bcbbdcbf914637b6d044c652b818b0e2c07f5c5 (patch) | |
| tree | 8224a5d489c8dc889e4e648cacbac206d6933790 /screen_ui.cpp | |
| parent | Snap for 4821358 from 31b994e8e93e04e29f59ac98e845b42750668178 to qt-release (diff) | |
| parent | Merge "updater_sample: update README.md" am: 1cb7222784 am: fc824cb998 (diff) | |
| download | android_bootable_recovery-5bcbbdcbf914637b6d044c652b818b0e2c07f5c5.tar android_bootable_recovery-5bcbbdcbf914637b6d044c652b818b0e2c07f5c5.tar.gz android_bootable_recovery-5bcbbdcbf914637b6d044c652b818b0e2c07f5c5.tar.bz2 android_bootable_recovery-5bcbbdcbf914637b6d044c652b818b0e2c07f5c5.tar.lz android_bootable_recovery-5bcbbdcbf914637b6d044c652b818b0e2c07f5c5.tar.xz android_bootable_recovery-5bcbbdcbf914637b6d044c652b818b0e2c07f5c5.tar.zst android_bootable_recovery-5bcbbdcbf914637b6d044c652b818b0e2c07f5c5.zip | |
Diffstat (limited to 'screen_ui.cpp')
| -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 { |