Call DestroyWindow rather than EndDialog, and update bDialogMessage()

microsoft · Apr 23, 2018 · f2dd108 · f2dd108
1 parent 737a608
commit f2dd108
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/wfdlgs3.c b/src/wfdlgs3.c
@@ -800,14 +800,14 @@ FormatSelectDlgProc(register HWND hDlg, UINT wMsg, WPARAM wParam, LPARAM lParam)
                 }
                 else
                 {
-                    EndDialog(hDlg, IDOK);
+                    DestroyWindow(hDlg);
                     hwndFormatSelect = NULL;
                 }
 
                 return TRUE;
             }
         case IDCANCEL:
-            EndDialog(hDlg, IDCANCEL);
+            DestroyWindow(hDlg);
             hwndFormatSelect = NULL;
             return TRUE;
         }

diff --git a/src/winfile.c b/src/winfile.c
@@ -1319,6 +1319,9 @@ bDialogMessage(PMSG pMsg)
       !CancelInfo.bModal &&
       IsDialogMessage(CancelInfo.hCancelDlg, pMsg)) ||
 
+      (hwndFormatSelect && 
+      IsDialogMessage(hwndFormatSelect, pMsg)) ||
+
       (SearchInfo.hSearchDlg &&
       IsDialogMessage(SearchInfo.hSearchDlg, pMsg)))