Skip to content

Display and control your Android device

Fix timeout thread startup race

cuishuang7e5d47038857
diff --git a/app/src/util/timeout.c b/app/src/util/timeout.c
index 21bc3a53..901fbf18 100644
--- a/app/src/util/timeout.c
+++ b/app/src/util/timeout.c
@@ -43,6 +43,12 @@ run_timeout(void *data) {
bool
sc_timeout_start(struct sc_timeout *timeout, sc_tick deadline,
const struct sc_timeout_callbacks *cbs, void *cbs_userdata) {
+ assert(cbs && cbs->on_timeout);
+
+ timeout->deadline = deadline;
+ timeout->cbs = cbs;
+ timeout->cbs_userdata = cbs_userdata;
+
bool ok = sc_thread_create(&timeout->thread, run_timeout, "scrcpy-timeout",
timeout);
if (!ok) {
@@ -50,12 +56,6 @@ sc_timeout_start(struct sc_timeout *timeout, sc_tick deadline,
return false;
}
- timeout->deadline = deadline;
-
- assert(cbs && cbs->on_timeout);
- timeout->cbs = cbs;
- timeout->cbs_userdata = cbs_userdata;
-
return true;
}