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

Merge pull request #35570 from markgarcia/fix-unconfigured-export-crash

Browse source 
Fix crash when exporting improperly configured project.
This commit is contained in:
Rémi Verschelde 2020-01-26 16:23:11 +01:00 committed by GitHub
commit 58fac4c874
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
platform/android/export/export.cpp
View file

@ -1495,17 +1495,19 @@ public:
virtual Error run(const Ref<EditorExportPreset> &p_preset, int p_device, int p_debug_flags) { 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); 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(); device_lock->lock();
EditorProgress ep("run", "Running on " + devices[p_device].name, 3); EditorProgress ep("run", "Running on " + devices[p_device].name, 3);
String adb = EditorSettings::get_singleton()->get("export/android/adb"); 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. // Export_temp APK.
if (ep.step("Exporting APK", 0)) { if (ep.step("Exporting APK", 0)) {