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

fix default config loading

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1039 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Paul Giblock
2008-06-01 23:07:22 +00:00
parent d3516cd5c5
commit 1f42dadbd1
2 changed files with 20 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ChangeLog
View File

@@ -1,3 +1,15 @@
2008-06-01 Paul Giblock <drfaygo/at/gmail/dot/com>
* src/tracks/pattern.cpp:
Improve drawing of tact lines, so it is more obvious where a pattern ends
* src/core/track.cpp:
Display floating text underneith the current track so you can actually see
what you are doing
* src/core/config_mgr.cpp:
Gracefully handle default lmmsrc.xml creation instead of aborting
2008-06-01 Tobias Doerffel <tobydox/at/users/dot/sourceforge/dot/net>
* plugins/ladspa_effect/caps/basics.h:
@@ -78,15 +90,6 @@
* src/gui/setup_dialog.cpp:
added PulseAudio-support
2008-06-01 Paul Giblock <drfaygo/at/gmail/dot/com>
* src/tracks/pattern.cpp:
Improve drawing of tact lines, so it is more obvious where a pattern ends
* src/core/track.cpp:
Display floating text underneith the current track so you can actually see
what you are doing
2008-05-30 Paul Giblock <drfaygo/at/gmail/dot/com>
* src/gui/piano_roll.cpp:

31
src/core/config_mgr.cpp
View File

@@ -239,31 +239,16 @@ bool configManager::loadConfigFile( void )
{
// read the XML file and create DOM tree
QFile cfg_file( m_lmmsRcFile );
if( !cfg_file.open( QIODevice::ReadOnly ) )
{
return( FALSE );
}
QDomDocument dom_tree;
if( !dom_tree.setContent( &cfg_file ) )
{
/* QMessageBox::critical( 0, tr( "Error in configuration-file" ),
tr( "Error while parsing "
"configuration-file %1.\n"
"The setup-wizard will be "
"shown for reconfiguring LMMS."
).arg( m_lmmsRcFile ) );
cfg_file.close();
if( exec() )
{
return( loadConfigFile() );
}
else
{*/
return( FALSE );
//}
}
cfg_file.close();
if( cfg_file.open( QIODevice::ReadOnly ) )
{
if( !dom_tree.setContent( &cfg_file ) )
{
return( FALSE );
}
cfg_file.close();
}
// get the head information from the DOM
QDomElement root = dom_tree.documentElement();