asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fix possible crash at ~EditorExportPlatformBB10

Browse source
This commit is contained in:
Marcelo 2017-09-08 21:35:20 -03:00
parent a36db90655
commit 0a1370ed96
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
platform/bb10/export/export.cpp
View file

@ -719,6 +719,8 @@ EditorExportPlatformBB10::EditorExportPlatformBB10() {
if (can_export()) { if (can_export()) {
device_thread = Thread::create(_device_poll_thread, this); device_thread = Thread::create(_device_poll_thread, this);
devices_changed = true; devices_changed = true;
} else {
device_thread = NULL;
} }
Image img(_bb10_logo); Image img(_bb10_logo);
@ -764,9 +766,16 @@ bool EditorExportPlatformBB10::can_export(String *r_error) const {
EditorExportPlatformBB10::~EditorExportPlatformBB10() { EditorExportPlatformBB10::~EditorExportPlatformBB10() {
quit_request = true; quit_request = true;
Thread::wait_to_finish(device_thread); if (device_thread) {
memdelete(device_lock); Thread::wait_to_finish(device_thread);
memdelete(device_thread); memdelete(device_thread);
device_thread = NULL;
}
if (device_lock) {
memdelete(device_lock);
device_lock = NULL;
}
} }
void register_bb10_exporter() { void register_bb10_exporter() {