hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Fix crash when rendering from command line and no write access to config file (#3413)

Browse Source 
* Fix crash when rendering from command line and no write access to config file

* Remove redundant call to ConfigManager::addRecentlyOpenedProject()
This commit is contained in:
Oskar Wallgren
2017-03-08 10:59:40 +01:00
committed by GitHub
parent 9545f968b3
commit 1b6a9f4885
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/core/ConfigManager.cpp
View File

@@ -547,14 +547,21 @@ void ConfigManager::saveConfigFile()
QFile outfile( m_lmmsRcFile );
if( !outfile.open( QIODevice::WriteOnly | QIODevice::Truncate ) )
{
QMessageBox::critical( NULL,
MainWindow::tr( "Could not save config-file" ),
MainWindow::tr( "Could not save configuration file %1. "
"You're probably not permitted to "
"write to this file.\n"
"Please make sure you have write-"
"access to the file and try again." ).
arg( m_lmmsRcFile ) );
QString title, message;
title = MainWindow::tr( "Could not open file" );
message = MainWindow::tr( "Could not open file %1 "
"for writing.\nPlease make "
"sure you have write "
"permission to the file and "
"the directory containing the "
"file and try again!"
).arg( m_lmmsRcFile );
if( gui )
{
QMessageBox::critical( NULL, title, message,
QMessageBox::Ok,
QMessageBox::NoButton );
}
return;
}

1
src/gui/MainWindow.cpp
View File

@@ -922,7 +922,6 @@ void MainWindow::openRecentlyOpenedProject( QAction * _action )
const QString & f = _action->text();
setCursor( Qt::WaitCursor );
Engine::getSong()->loadProject( f );
ConfigManager::inst()->addRecentlyOpenedProject( f );
setCursor( Qt::ArrowCursor );
}
runAutoSave();