Amebis/GEANTLink
Amebis/GEANTLink
1
1
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 50 Wiki Activity

Upgrade eap::monitor_ui's HWND to volatile

Browse Source 
Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman 2019-08-13 14:28:21 +02:00
parent 009cd36fe2
commit dfd26f214d
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/EAPBase_UI/include/EAP_UI.h
View File

@ -1219,7 +1219,7 @@ namespace eap
bool m_is_master; ///< Is this monitor master? bool m_is_master; ///< Is this monitor master?
HWND m_hwnd; ///< Message window handle HWND m_hwnd; ///< Message window handle
std::list<HWND> m_slaves; ///< List of slaves to notify on finish std::list<HWND> m_slaves; ///< List of slaves to notify on finish
HWND m_hwnd_popup; ///< Pop-up window handle volatile HWND m_hwnd_popup; ///< Pop-up window handle
std::vector<unsigned char> m_data; ///< Data master sent std::vector<unsigned char> m_data; ///< Data master sent
// Custom window messages // Custom window messages

11
lib/EAPBase_UI/src/EAP_UI.cpp
View File

@ -608,12 +608,13 @@ LRESULT eap::monitor_ui::winproc(
assert(m_is_master); assert(m_is_master);
m_slaves.push_back((HWND)lparam); m_slaves.push_back((HWND)lparam);
if (m_hwnd_popup) { HWND hwnd_popup = m_hwnd_popup;
if (hwnd_popup) {
// Bring pop-up window up. // Bring pop-up window up.
if (::IsIconic(m_hwnd_popup)) if (::IsIconic(hwnd_popup))
::SendMessage(m_hwnd_popup, WM_SYSCOMMAND, SC_RESTORE, 0); ::SendMessage(hwnd_popup, WM_SYSCOMMAND, SC_RESTORE, 0);
::SetActiveWindow(m_hwnd_popup); ::SetActiveWindow(hwnd_popup);
::SetForegroundWindow(m_hwnd_popup); ::SetForegroundWindow(hwnd_popup);
} }
return TRUE; return TRUE;