Index: reactos/base/applications/notepad/dialog.c
===================================================================
--- reactos/base/applications/notepad/dialog.c	(revision 58022)
+++ reactos/base/applications/notepad/dialog.c	(working copy)
@@ -259,7 +259,8 @@
         /* prompt user to save changes */
         nResult = AlertFileNotSaved(Globals.szFileName);
         switch (nResult) {
-            case IDYES:     DIALOG_FileSave();
+            case IDYES:     if(!DIALOG_FileSave())
+                                return(FALSE);
                             break;
 
             case IDNO:      break;
@@ -384,12 +385,12 @@
 }
 
 
-VOID DIALOG_FileSave(VOID)
+BOOL DIALOG_FileSave(VOID)
 {
     if (Globals.szFileName[0] == '\0')
-        DIALOG_FileSaveAs();
-    else
-        DoSaveFile();
+        return DIALOG_FileSaveAs();
+    DoSaveFile();
+    return TRUE;
 }
 
 static UINT_PTR CALLBACK DIALOG_FileSaveAs_Hook(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
@@ -448,7 +449,7 @@
     return 0;
 }
 
-VOID DIALOG_FileSaveAs(VOID)
+BOOL DIALOG_FileSaveAs(VOID)
 {
     OPENFILENAME saveas;
     TCHAR szDir[MAX_PATH];
@@ -479,7 +480,9 @@
         SetFileName(szPath);
         UpdateWindowCaption();
         DoSaveFile();
+        return TRUE;
     }
+    return FALSE;
 }
 
 VOID DIALOG_FilePrint(VOID)
Index: reactos/base/applications/notepad/dialog.h
===================================================================
--- reactos/base/applications/notepad/dialog.h	(revision 58022)
+++ reactos/base/applications/notepad/dialog.h	(working copy)
@@ -20,8 +20,8 @@
 
 VOID DIALOG_FileNew(VOID);
 VOID DIALOG_FileOpen(VOID);
-VOID DIALOG_FileSave(VOID);
-VOID DIALOG_FileSaveAs(VOID);
+BOOL DIALOG_FileSave(VOID);
+BOOL DIALOG_FileSaveAs(VOID);
 VOID DIALOG_FilePrint(VOID);
 VOID DIALOG_FilePageSetup(VOID);
 VOID DIALOG_FilePrinterSetup(VOID);