diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-07-20 08:37:10 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2018-07-20 08:37:10 +0200 |
| commit | 8c9e10553cd429857086a9d635fc55305065ff76 (patch) | |
| tree | 0fa8472544175adfa4f5fe49a887f9bc6dd0a19a /core | |
| parent | 286c88bb50003fc9f8c20ecd8fa348bf2027deae (diff) | |
Fix build issues and typos after c69de2ba4
Diffstat (limited to 'core')
| -rw-r--r-- | core/os/os.cpp | 3 | ||||
| -rw-r--r-- | core/os/os.h | 2 | ||||
| -rw-r--r-- | core/project_settings.h | 8 |
3 files changed, 7 insertions, 6 deletions
diff --git a/core/os/os.cpp b/core/os/os.cpp index 3b34f0aa15..89866e4044 100644 --- a/core/os/os.cpp +++ b/core/os/os.cpp @@ -667,7 +667,8 @@ void OS::set_restart_on_exit(bool p_restart, const List<String> &p_restart_argum bool OS::is_restart_on_exit_set() const { return restart_on_exit; } -List<String> OS::get_restart_on_exit_argumens() const { + +List<String> OS::get_restart_on_exit_arguments() const { return restart_commandline; } diff --git a/core/os/os.h b/core/os/os.h index 2e4888dfba..4e0cb003fb 100644 --- a/core/os/os.h +++ b/core/os/os.h @@ -502,7 +502,7 @@ public: void set_restart_on_exit(bool p_restart, const List<String> &p_restart_arguments); bool is_restart_on_exit_set() const; - List<String> get_restart_on_exit_argumens() const; + List<String> get_restart_on_exit_arguments() const; OS(); virtual ~OS(); diff --git a/core/project_settings.h b/core/project_settings.h index 28b96a8144..75ebc5acc8 100644 --- a/core/project_settings.h +++ b/core/project_settings.h @@ -64,16 +64,16 @@ protected: order(0), persist(false), hide_from_editor(false), - overridden(false) { - restart_if_changed = false; + overridden(false), + restart_if_changed(false) { } VariantContainer(const Variant &p_variant, int p_order, bool p_persist = false) : order(p_order), persist(p_persist), variant(p_variant), hide_from_editor(false), - overridden(false) { - restart_if_changed = false; + overridden(false), + restart_if_changed(false) { } }; |