diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-01-26 16:23:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-26 16:23:11 +0100 |
| commit | 58fac4c8740586e573c4c4b98dc4f8b49cca7308 (patch) | |
| tree | 7f7be806a2be7f075face8c706eef4d40fdb0ee4 | |
| parent | 689db68822ad48a75a595e3dae17388dbbf64c10 (diff) | |
| parent | 141230192cb534a8e6e2ce7d1c7abcc7ec5d9a33 (diff) | |
Merge pull request #35570 from markgarcia/fix-unconfigured-export-crash
Fix crash when exporting improperly configured project.
| -rw-r--r-- | platform/android/export/export.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index 0ebd97d428..52ab2a317d 100644 --- a/platform/android/export/export.cpp +++ b/platform/android/export/export.cpp @@ -1495,17 +1495,19 @@ public: virtual Error run(const Ref<EditorExportPreset> &p_preset, int p_device, int p_debug_flags) { ERR_FAIL_INDEX_V(p_device, devices.size(), ERR_INVALID_PARAMETER); + + String can_export_error; + bool can_export_missing_templates; + if (!can_export(p_preset, can_export_error, can_export_missing_templates)) { + EditorNode::add_io_error(can_export_error); + return ERR_UNCONFIGURED; + } + device_lock->lock(); EditorProgress ep("run", "Running on " + devices[p_device].name, 3); String adb = EditorSettings::get_singleton()->get("export/android/adb"); - if (adb == "") { - - EditorNode::add_io_error("ADB executable not configured in settings, can't run."); - device_lock->unlock(); - return ERR_UNCONFIGURED; - } // Export_temp APK. if (ep.step("Exporting APK", 0)) { |