From 82928e6a50b1f6f3ef676ccea1493323d05b63a6 Mon Sep 17 00:00:00 2001 From: shatty Date: Fri, 8 Aug 2003 05:05:10 +0000 Subject: [PATCH] fixed close click save does not save bug git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4241 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/stylededit/StyledEditWindow.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/apps/stylededit/StyledEditWindow.cpp b/src/apps/stylededit/StyledEditWindow.cpp index cce8b55e7b..f8210f6cb3 100644 --- a/src/apps/stylededit/StyledEditWindow.cpp +++ b/src/apps/stylededit/StyledEditWindow.cpp @@ -773,17 +773,15 @@ StyledEditWindow::QuitRequested() saveAlert->SetShortcut(1,'d'); saveAlert->SetShortcut(2,'s'); buttonIndex= saveAlert->Go(); - + if (buttonIndex==0) { //"cancel": dont save, dont close the window return false; } else if(buttonIndex==1) { // "don't save": just close the window return true; - } else if(!fSaveMessage) { //save as - DispatchMessage(new BMessage(MENU_SAVEAS), this); - return false; - } else { - DispatchMessage(new BMessage(B_SAVE_REQUESTED), this); - return true; + } else if(!fSaveMessage) { //save as + return SaveAs(); + } else { + return (Save(fSaveMessage) == B_OK); } }/***QuitRequested()***/ @@ -791,7 +789,7 @@ StyledEditWindow::QuitRequested() status_t StyledEditWindow::Save(BMessage *message) { - status_t err; + status_t err = B_OK; if(!message){ message=fSaveMessage; @@ -855,12 +853,12 @@ StyledEditWindow::Save(BMessage *message) } // clear clean modes - fSaveItem->SetEnabled(false); + fSaveItem->SetEnabled(false); fRevertItem->SetEnabled(false); fUndoCleans = false; fRedoCleans = false; fClean = true; - return err; + return err; } /***Save()***/ status_t @@ -914,6 +912,7 @@ StyledEditWindow::SaveAs() } } fSavePanel->Show(); + return B_OK; } void