Merged muonspin/musrfit:root6 into master

This commit is contained in:
Zaher Salman 2020-09-11 10:22:39 +02:00
commit 693b99755d

View File

@ -1342,8 +1342,10 @@ void PTextEdit::fileSave()
fileSaveAs();
} else {
QFile file( *fFilenames.find( currentEditor() ) );
if ( !file.open( QIODevice::WriteOnly ) )
if ( !file.open( QIODevice::WriteOnly ) ) {
QMessageBox::critical(this, "**ERROR**", "Couldn't save the file!\nDisk full?\nNo write access?");
return;
}
QTextStream ts( &file );
ts << currentEditor()->toPlainText();
@ -1374,7 +1376,6 @@ void PTextEdit::fileSaveAs()
fFilenames.remove( currentEditor() );
fFilenames.insert( currentEditor(), fn );
fileSave();
fTabWidget->setTabText(fTabWidget->indexOf( currentEditor() ), QFileInfo(fn).fileName());
}
fileSystemWatcherActivation(); // delayed activation of fFileSystemWatcherActive