upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-03 22:51:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add more null checks for the window

Browse Source
This commit is contained in:
Jyrki Vesterinen 2016-12-06 19:28:29 +02:00
parent 3e41a51ea6
commit 30524b7318
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/controller_base.cpp
View File

@ -133,7 +133,8 @@ void controller_base::process_keyup_event(const SDL_Event& /*event*/) {
bool controller_base::handle_scroll(int mousex, int mousey, int mouse_flags, double x_axis, double y_axis)
{
bool mouse_in_window = (CVideo::get_singleton().get_window()->get_flags() & SDL_WINDOW_MOUSE_FOCUS) != 0
sdl::window* window = CVideo::get_singleton().get_window();
bool mouse_in_window = (window != nullptr && (window->get_flags() & SDL_WINDOW_MOUSE_FOCUS) != 0)
|| preferences::get("scroll_when_mouse_outside", true);
int scroll_speed = preferences::scroll_speed();
int dx = 0, dy = 0;
@ -276,7 +277,8 @@ void controller_base::play_slice(bool is_delay_enabled)
// be nice when window is not visible
// NOTE should be handled by display instead, to only disable drawing
if (is_delay_enabled && (CVideo::get_singleton().get_window()->get_flags() & SDL_WINDOW_SHOWN) == 0) {
sdl::window* window = CVideo::get_singleton().get_window();
if (window != nullptr && is_delay_enabled && (window->get_flags() & SDL_WINDOW_SHOWN) == 0) {
CVideo::delay(200);
}