diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2019-06-29 18:16:43 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-29 18:16:43 +0200 |
commit | b0809046bedf882008788169430ebb3e83acbbea (patch) | |
tree | c7e0364f44a11f155f13e50ffd689d66767a6899 | |
parent | 5cf51cc7e4457c5c9f4b51ab99d6f5ed9eaf5e78 (diff) | |
parent | 9ebc146383e562cab8ac15ec5b97d7689bebe1a7 (diff) |
Merge pull request #30154 from bojidar-bg/30149-export-flag-editor
Ensure --export implies --editor
-rw-r--r-- | main/main.cpp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/main/main.cpp b/main/main.cpp index 77c4e5a385..815e940a0a 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -599,6 +599,10 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph auto_build_solutions = true; editor = true; + } else if (I->get() == "--export" || I->get() == "--export-debug") { // Export project + + editor = true; + main_args.push_back(I->get()); #endif } else if (I->get() == "--path") { // set path of project to start or edit @@ -1343,20 +1347,10 @@ bool Main::start() { removal_docs.push_back(args[j]); } else if (args[i] == "--export") { editor = true; //needs editor - if (i + 1 < args.size()) { - _export_preset = args[i + 1]; - } else { - ERR_PRINT("Export preset name not specified"); - return false; - } + _export_preset = args[i + 1]; } else if (args[i] == "--export-debug") { editor = true; //needs editor - if (i + 1 < args.size()) { - _export_preset = args[i + 1]; - } else { - ERR_PRINT("Export preset name not specified"); - return false; - } + _export_preset = args[i + 1]; export_debug = true; #endif } else { |