diff options
author | 2016-04-20 10:24:59 -0400 | |
---|---|---|
committer | 2016-04-21 11:10:03 -0400 | |
commit | 1a844a49c5fe01552347ea086ef7c65874dadf3e (patch) | |
tree | 2ff1ec2357e19793146089898f9e3e26f0bca94b /src/osd/modules/input/input_dinput.cpp | |
parent | ff27716bec51cad5f073019bee093a2deee6fc47 (diff) |
Refactor OSD window.
Unified renderer in osd_window as std::unique_ptr
Made windows all std::shared_ptr<window_type>
Made window lists std::list<std::shared_ptr<window_type>>
Updated OSD SDL worker_param to not use malloc (not compatible with smart
pointers)
Made renderer pointer to window a weak reference. May not be available
during destruction of the window.
Diffstat (limited to 'src/osd/modules/input/input_dinput.cpp')
-rw-r--r-- | src/osd/modules/input/input_dinput.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/osd/modules/input/input_dinput.cpp b/src/osd/modules/input/input_dinput.cpp index ca3bad08026..dfb63482570 100644 --- a/src/osd/modules/input/input_dinput.cpp +++ b/src/osd/modules/input/input_dinput.cpp @@ -564,7 +564,7 @@ public: dinput_joystick_device *devinfo; int result = 0; - if (win_window_list != nullptr && win_window_list->win_has_menu()) + if (!win_window_list.empty() && win_window_list.front()->win_has_menu()) cooperative_level = DISCL_BACKGROUND | DISCL_NONEXCLUSIVE; // allocate and link in a new device |