Selaa lähdekoodia

Merge pull request #11084 from marcelofg55/crashfix_bb10

Fix possible crash at ~EditorExportPlatformBB10
Rémi Verschelde 8 vuotta sitten
vanhempi
commit
849361624b
1 muutettua tiedostoa jossa 12 lisäystä ja 3 poistoa
  1. 12 3
      platform/bb10/export/export.cpp

+ 12 - 3
platform/bb10/export/export.cpp

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