summaryrefslogtreecommitdiffstats
path: root/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 /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--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) {