Genymobile/scrcpy
1
0
Fork 0
mirror of https://github.com/Genymobile/scrcpy.git synced 2026-04-21 01:33:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Only reject RUN_ON_MAIN_THREAD events on quit

Browse source 
Use SDL_PeepEvents() to consume only SC_EVENT_RUN_ON_MAIN_THREAD events.
Other events are not dropped and can still be processed later.

PR #6662 <https://github.com/Genymobile/scrcpy/pull/6662>
This commit is contained in:
Romain Vimont 2026-02-24 00:25:52 +01:00
parent 02949e7574
commit 1da65bbc98
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
app/src/scrcpy.c
View file

@ -209,17 +209,18 @@ event_loop(struct scrcpy *s, bool has_screen) {
}
static void
terminate_event_loop(void) {
terminate_runnables_on_event_loop(void) {
sc_reject_new_runnables();
SDL_Event event;
while (SDL_PollEvent(&event)) {
if (event.type == SC_EVENT_RUN_ON_MAIN_THREAD) {
// Make sure all posted runnables are run, to avoid memory leaks
sc_runnable_fn run = event.user.data1;
void *userdata = event.user.data2;
run(userdata);
}
while (SDL_PeepEvents(&event, 1, SDL_GETEVENT,
SC_EVENT_RUN_ON_MAIN_THREAD,
SC_EVENT_RUN_ON_MAIN_THREAD) == 1) {
assert(event.type == SC_EVENT_RUN_ON_MAIN_THREAD);
// Make sure all posted runnables are run, to avoid memory leaks
sc_runnable_fn run = event.user.data1;
void *userdata = event.user.data2;
run(userdata);
}
}
@ -946,7 +947,7 @@ aoa_complete:
}
ret = event_loop(s, options->window);
terminate_event_loop();
terminate_runnables_on_event_loop();
LOGD("quit...");
if (options->window) {