summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy White <jwhite@codeweavers.com>2016-09-19 13:02:38 -0500
committerJeremy White <jwhite@codeweavers.com>2016-09-19 13:02:38 -0500
commitcec08c79ce3eb320db3c5dca2dee1be5e0619495 (patch)
tree88bd8fcf11c96063fa758ecc4645de42f2e49d63
parente58e61f181e08fc3f848b6ef496fd8c00bde5d40 (diff)
Create the scanner before the display thread.
Avoids a potential race condition error.
-rw-r--r--src/session.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/session.c b/src/session.c
index 5c52dd8..416e7ad 100644
--- a/src/session.c
+++ b/src/session.c
@@ -194,16 +194,16 @@ int session_start(session_t *s)
s->display.session = s;
s->scanner.session = s;
- rc = display_start_event_thread(&s->display);
- if (rc)
- return rc;
-
s->running = TRUE;
rc = scanner_create(&s->scanner);
if (rc)
goto end;
+ rc = display_start_event_thread(&s->display);
+ if (rc)
+ return rc;
+
end:
global_session = s;