From 1f42dadbd11bb2101bbe84c4f078a4bbb8dcb919 Mon Sep 17 00:00:00 2001
From: Paul Giblock <drfaygo@gmail.com>
Date: Sun, 1 Jun 2008 23:07:22 +0000
Subject: [PATCH] fix default config loading

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1039 0778d3d1-df1d-0410-868b-ea421aaaa00d
---
 ChangeLog               | 21 ++++++++++++---------
 src/core/config_mgr.cpp | 31 ++++++++-----------------------
 2 files changed, 20 insertions(+), 32 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5c34567bb..5691ffa71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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:
diff --git a/src/core/config_mgr.cpp b/src/core/config_mgr.cpp
index 413e9ac9d..f092fbb5b 100644
--- a/src/core/config_mgr.cpp
+++ b/src/core/config_mgr.cpp
@@ -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();