Gremlinsoft
/
godot
forked from sascha/godot
2
0
Fork 0
Code Pull Requests Activity

fixed branch on uninit and data race in editor android device polling 

Initialised relevant variables before stating thread,
to prevent a branch on uninitialised data.
Fixed race condition in polling that could miss a device change.

(cherry picked from commit fe4265ad46)
3.0
Ibrahn Sahir 2018-07-13 13:30:50 +07:00 committed by Rémi Verschelde
parent 4b69ed4124
commit b890ed527b
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
platform/android/export/export.cpp
Unescape Escape View File

@ -228,7 +228,7 @@ class EditorExportAndroid : public EditorExportPlatform {
};
Vector<Device> devices;
bool devices_changed;
volatile bool devices_changed;
Mutex *device_lock;
Thread *device_thread;
volatile bool quit_request;
@ -1156,7 +1156,10 @@ public:
virtual bool poll_devices() {
bool dc = devices_changed;
devices_changed = false;
if (dc) {
// don't clear unless we're reporting true, to avoid race
devices_changed = false;
}
return dc;
}
@ -1859,9 +1862,9 @@ public:
run_icon->create_from_image(img);
device_lock = Mutex::create();
device_thread = Thread::create(_device_poll_thread, this);
devices_changed = true;
quit_request = false;
device_thread = Thread::create(_device_poll_thread, this);
}
~EditorExportAndroid() {