summaryrefslogtreecommitdiffstats
path: root/ui.cpp
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2018-06-08 11:36:01 +0200
committerandroid-build-team Robot <android-build-team-robot@google.com>2018-06-08 11:36:01 +0200
commit5bcbbdcbf914637b6d044c652b818b0e2c07f5c5 (patch)
tree8224a5d489c8dc889e4e648cacbac206d6933790 /ui.cpp
parentSnap for 4821358 from 31b994e8e93e04e29f59ac98e845b42750668178 to qt-release (diff)
parentMerge "updater_sample: update README.md" am: 1cb7222784 am: fc824cb998 (diff)
downloadandroid_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 'ui.cpp')
-rw-r--r--ui.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/ui.cpp b/ui.cpp
index 51d7f129c..6c91d01b8 100644
--- a/ui.cpp
+++ b/ui.cpp
@@ -78,7 +78,9 @@ RecoveryUI::RecoveryUI()
RecoveryUI::~RecoveryUI() {
ev_exit();
input_thread_stopped_ = true;
- input_thread_.join();
+ if (input_thread_.joinable()) {
+ input_thread_.join();
+ }
}
void RecoveryUI::OnKeyDetected(int key_code) {