summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/modules/input/input_sdlcommon.cpp
diff options
context:
space:
mode:
author therealmogminer@gmail.com <therealmogminer@gmail.com>2016-06-18 17:15:17 +0200
committer therealmogminer@gmail.com <therealmogminer@gmail.com>2016-06-18 17:15:17 +0200
commitb4beaa37b744c8b2804ff398e373e035a7e8941c (patch)
tree93b7a1edcfb25197fce1028959f1f494fa3d461b /src/osd/modules/input/input_sdlcommon.cpp
parent0213201d1d902f7f166afd8f0ded227b009dfc07 (diff)
parent1ad39fd8250863ff4c7f90e84d971db006085a17 (diff)
Merge remote-tracking branch 'mainline/master'
Diffstat (limited to 'src/osd/modules/input/input_sdlcommon.cpp')
-rw-r--r--src/osd/modules/input/input_sdlcommon.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/osd/modules/input/input_sdlcommon.cpp b/src/osd/modules/input/input_sdlcommon.cpp
index 3071959a463..479e5975666 100644
--- a/src/osd/modules/input/input_sdlcommon.cpp
+++ b/src/osd/modules/input/input_sdlcommon.cpp
@@ -39,12 +39,12 @@ static inline std::shared_ptr<sdl_window_info> window_from_id(Uint32 windowID)
{
SDL_Window *window = SDL_GetWindowFromID(windowID);
- for (auto w : sdl_window_list)
+ for (auto w : osd_common_t::s_window_list)
{
//printf("w->window_id: %d\n", w->window_id);
if (w->platform_window<SDL_Window*>() == window)
{
- return w;
+ return std::static_pointer_cast<sdl_window_info>(w);
}
}
return nullptr;