diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-10-20 18:31:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-20 18:31:56 +0200 |
| commit | 160d5908c6b9df63d9812fb22c77b2c12d677c22 (patch) | |
| tree | a1e3c6f9bd0c26109c930a16abc57d4881efe1bf /main/main.cpp | |
| parent | 8748247d6f5b65358ae69f5c44f4fdfb70633382 (diff) | |
| parent | 8fa67fba4795bb3fdd62baecb0bfdf699e37707d (diff) | |
Merge pull request #54027 from akien-mga/doctool-headless
Diffstat (limited to 'main/main.cpp')
| -rw-r--r-- | main/main.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/main/main.cpp b/main/main.cpp index 79957005ca..e78dec9bb3 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -1343,8 +1343,9 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph display_driver_idx = 0; } - if (audio_driver == "") { // specified in project.godot - audio_driver = GLOBAL_DEF_RST_NOVAL("audio/driver/driver", AudioDriverManager::get_driver(0)->get_name()); + GLOBAL_DEF_RST_NOVAL("audio/driver/driver", AudioDriverManager::get_driver(0)->get_name()); + if (audio_driver == "") { // Specified in project.godot. + audio_driver = GLOBAL_GET("audio/driver/driver"); } for (int i = 0; i < AudioDriverManager::get_driver_count(); i++) { |