Fix handling of combo-box selection changes in Options

rafalh · Aug 24, 2024 · e991954 · e991954
1 parent 870f869
commit e991954
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/launcher/OptionsDisplayDlg.cpp b/launcher/OptionsDisplayDlg.cpp
@@ -119,21 +119,20 @@ void OptionsDisplayDlg::UpdateColorDepthCombo()
     m_color_depth_combo.SetCurSel(m_conf.res_bpp == 16 ? index_16 : index_32);
 }
 
-LRESULT OptionsDisplayDlg::OnNotify([[ maybe_unused ]] WPARAM wparam, LPARAM lparam)
+BOOL OptionsDisplayDlg::OnCommand(WPARAM wparam, [[ maybe_unused ]] LPARAM lparam)
 {
-    auto& nmhdr = *reinterpret_cast<LPNMHDR>(lparam);
-    switch (nmhdr.code) {
-    case CBN_SELCHANGE:
-        if (nmhdr.idFrom == IDC_ADAPTER_COMBO) {
-            OnAdapterChange();
+    if (HIWORD(wparam) == CBN_SELCHANGE) {
+        switch (LOWORD(wparam)) {
+            case IDC_ADAPTER_COMBO:
+                OnAdapterChange();
+                break;
+            case IDC_WND_MODE_COMBO:
+                OnWindowModeChange();
+                break;
+            case IDC_COLOR_DEPTH_COMBO:
+                OnColorDepthChange();
+                break;
         }
-        else if (nmhdr.idFrom == IDC_WND_MODE_COMBO) {
-            OnWindowModeChange();
-        }
-        else if (nmhdr.idFrom == IDC_COLOR_DEPTH_COMBO) {
-            OnColorDepthChange();
-        }
-        break;
     }
     return 0;
 }

diff --git a/launcher/OptionsDisplayDlg.h b/launcher/OptionsDisplayDlg.h
@@ -20,7 +20,7 @@ class OptionsDisplayDlg : public CDialog
 
 protected:
     BOOL OnInitDialog() override;
-    LRESULT OnNotify(WPARAM wparam, LPARAM lparam) override;
+    BOOL OnCommand(WPARAM wparam, LPARAM lparam) override;
 
 private:
     void InitToolTip();