diff options
| author | Rémi Verschelde | 2016-07-21 17:31:14 +0200 |
|---|---|---|
| committer | GitHub | 2016-07-21 17:31:14 +0200 |
| commit | 93de25f68a6b277293c0d3476996ab074ba3dc16 (patch) | |
| tree | 54a0373eb925fab10751a662744daa08aadb2229 /platform/android/export/export.cpp | |
| parent | 2c1a74fb3a8aac2d8d8a7050b890aa780a5f0356 (diff) | |
| parent | beaa56bff209d4a4a24e556ff4b592f380c99550 (diff) | |
| download | godot-93de25f68a6b277293c0d3476996ab074ba3dc16.tar.gz godot-93de25f68a6b277293c0d3476996ab074ba3dc16.tar.zst godot-93de25f68a6b277293c0d3476996ab074ba3dc16.zip | |
Merge pull request #5837 from hurikhan/android_cleanup
Minor code formatting in platform/android
Diffstat (limited to 'platform/android/export/export.cpp')
| -rw-r--r-- | platform/android/export/export.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index f4fafc4fa..10d77aba6 100644 --- a/platform/android/export/export.cpp +++ b/platform/android/export/export.cpp @@ -1482,6 +1482,7 @@ int EditorExportPlatformAndroid::get_device_count() const { return dc; } + String EditorExportPlatformAndroid::get_device_name(int p_device) const { ERR_FAIL_INDEX_V(p_device,devices.size(),""); @@ -1490,6 +1491,7 @@ String EditorExportPlatformAndroid::get_device_name(int p_device) const { device_lock->unlock(); return s; } + String EditorExportPlatformAndroid::get_device_info(int p_device) const { ERR_FAIL_INDEX_V(p_device,devices.size(),""); @@ -1883,7 +1885,6 @@ bool EditorExportPlatformAndroid::can_export(String *r_error) const { EditorExportPlatformAndroid::~EditorExportPlatformAndroid() { - quit_request=true; Thread::wait_to_finish(device_thread); memdelete(device_lock); @@ -1912,6 +1913,5 @@ void register_android_exporter() { Ref<EditorExportPlatformAndroid> exporter = Ref<EditorExportPlatformAndroid>( memnew(EditorExportPlatformAndroid) ); EditorImportExport::get_singleton()->add_export_platform(exporter); - } |