Find/Replace - add Go to Go To #259

Author: cshnik

src/Edit.c

@@ -48,6 +48,7 @@ extern HINSTANCE g_hInstance;
 extern LPMALLOC  g_lpMalloc;
 extern DWORD dwLastIOError;
 extern HWND hDlgFindReplace;
+extern HWND hDlgGotoLine;
 extern UINT cpLastFind;
 extern BOOL bReplaceInitialized;
 
@@ -6203,7 +6204,8 @@ INT_PTR CALLBACK EditLinenumDlgProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM
                   )
               {
                 EditJumpTo(hwndEdit, iNewLine, iNewCol);
-                EndDialog(hwnd, IDOK);
+                DestroyWindow(hwnd);
+                hDlgGotoLine = NULL;
               }
               else
               {
@@ -6220,8 +6222,8 @@ INT_PTR CALLBACK EditLinenumDlgProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM
           }
           break;
         case IDCANCEL:
-          EndDialog(hwnd, IDCANCEL);
           DestroyWindow(hwnd);
+          hDlgGotoLine = NULL;
           break;
 
       }

src/Notepad2.c

@@ -3829,7 +3829,6 @@ LRESULT MsgCommand(HWND hwnd, WPARAM wParam, LPARAM lParam)
         {
           SendMessage(hDlgFindReplace, WM_COMMAND, MAKELONG(IDMSG_SWITCHTOGOTO, 1), 0);
           DestroyWindow(hDlgFindReplace);
-          hDlgFindReplace = NULL;
         }
         if (!IsWindow(hDlgGotoLine))
         {