| -rw-r--r-- | core/apps/textedit/textedit.cpp | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp index 086fdb6..1d0df6a 100644 --- a/core/apps/textedit/textedit.cpp +++ b/core/apps/textedit/textedit.cpp @@ -776,4 +776,5 @@ void TextEdit::showEditTools() { unprompted save */ bool TextEdit::save() { + QString name, file; odebug << "saveAsFile " + currentFileName << oendl; if(currentFileName.isEmpty()) { @@ -781,9 +782,14 @@ bool TextEdit::save() { return false; } - - QString file = doc->file(); - odebug << "saver file "+file << oendl; - QString name= doc->name(); - odebug << "File named "+name << oendl; + name = currentFileName; + if(doc) { + file = doc->file(); + odebug << "saver file "+file << oendl; + name = doc->name(); + odebug << "File named "+name << oendl; + } else { + name = file = currentFileName; + } + QString rt = editor->text(); if( !rt.isEmpty() ) { @@ -791,5 +797,5 @@ bool TextEdit::save() { saveAs(); } else { - currentFileName= name ; + currentFileName = name; odebug << "saveFile "+currentFileName << oendl; @@ -803,5 +809,5 @@ bool TextEdit::save() { FileManager fm; if ( !fm.saveFile( *doc, rt ) ) { - QMessageBox::message(tr("Text Edit"),tr("Save Failed")); + QMessageBox::message(tr("Text Edit"),tr("Save Failed")); return false; } @@ -809,11 +815,11 @@ bool TextEdit::save() { odebug << "regular save file" << oendl; QFile f(file); - if( f.open(IO_WriteOnly)) { - QCString crt = rt.utf8(); - f.writeBlock(crt,crt.length()); - } else { - QMessageBox::message(tr("Text Edit"),tr("Write Failed")); - return false; - } + if( f.open(IO_WriteOnly)) { + QCString crt = rt.utf8(); + f.writeBlock(crt,crt.length()); + } else { + QMessageBox::message(tr("Text Edit"),tr("Write Failed")); + return false; + } } @@ -822,5 +828,5 @@ bool TextEdit::save() { edited=false; if(caption().left(1)=="*") - setCaption(caption().right(caption().length()-1)); + setCaption(caption().right(caption().length()-1)); |