diff options
| author | Mateo Kuruk Miccino <mateomiccino@gmail.com> | 2020-03-12 20:12:34 -0300 |
|---|---|---|
| committer | Mateo Kuruk Miccino <mateomiccino@gmail.com> | 2020-03-26 15:49:54 +0100 |
| commit | f387b9b4f4ef3ae6eba5199b4089ef591f2d7ba2 (patch) | |
| tree | e9551e973d3b534c769279bba2ad58c7d991d2bf /main/main.cpp | |
| parent | 9a5d15a2dcb08aa9f3732a0e8e41f2e81c2be365 (diff) | |
Multiple changes to DisplayServerX11
- Travis: Change x11 to linuxbsd
- SCons: Change x11 plataform to linuxbsd
- Plugins: Remove ; to avoid fallthrough warning
- DisplayServerX11: Implement set_icon
- DisplayServerX11: Fix X11 bug when a window was erased from windows
map, all the changes from that erased windows are sending to the main
window
- DisplayServerX11: Reorder create_window commands
- DisplayServerX11: Change every Size2 to Size2i and Rect2 to Rect2i
where it belongs
+ More X11 fixes which have been integrated directly back into reduz's
original commits while rebasing the branch.
Diffstat (limited to 'main/main.cpp')
| -rw-r--r-- | main/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/main.cpp b/main/main.cpp index 2ce3001829..c9fde81f7a 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -905,7 +905,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph #else const String error_msg = "Error: Couldn't load project data at path \"" + project_path + "\". Is the .pck file missing?\nIf you've renamed the executable, the associated .pck file should also be renamed to match the executable's name (without the extension).\n"; OS::get_singleton()->print("%s", error_msg.ascii().get_data()); - OS::get_singleton()->alert(error_msg); + DisplayServer::get_singleton()->alert(error_msg); goto error; #endif |