Merge with trunk R2920.

git-svn-id: svn://localhost/ardour2/trunk@2921 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 43 insertions, 20 deletions

diff --git a/libs/ardour/configuration.cc b/libs/ardour/configuration.cc
index 1460491180..b164d418ab 100644
--- a/libs/ardour/configuration.cc
+++ b/libs/ardour/configuration.cc
@@ -20,6 +20,9 @@
 #include <unistd.h>
 #include <cstdio> /* for snprintf, grrr */
 
+#include <glib.h>  
+#include <glib/gstdio.h> /* for g_stat() */
+
 #include <pbd/failed_constructor.h>
 #include <pbd/xml++.h>
 #include <pbd/filesystem.h>
@@ -80,7 +83,8 @@ Configuration::load_state ()
 	bool found = false;
 
 	sys::path system_rc_file;
-	
+	struct stat statbuf;
+
 	/* load system configuration first */
 	
 	if ( find_file_in_search_path (ardour_search_path() + system_config_search_path(),
@@ -91,18 +95,28 @@ Configuration::load_state ()
 
 		string rcfile = system_rc_file.to_string();
 
-		cerr << string_compose (_("loading system configuration file %1"), rcfile) << endl;
+		/* stupid XML Parser hates empty files */
 		
-		if (!tree.read (rcfile.c_str())) {
-			error << string_compose(_("Ardour: cannot read system configuration file \"%1\""), rcfile) << endmsg;
+		if (g_stat (rcfile.c_str(), &statbuf)) {
 			return -1;
 		}
 
-		current_owner = ConfigVariableBase::System;
-
-		if (set_state (*tree.root())) {
-			error << string_compose(_("Ardour: system configuration file \"%1\" not loaded successfully."), rcfile) << endmsg;
-			return -1;
+		if (statbuf.st_size != 0) {
+			cerr << string_compose (_("loading system configuration file %1"), rcfile) << endl;
+			
+			if (!tree.read (rcfile.c_str())) {
+				error << string_compose(_("Ardour: cannot read system configuration file \"%1\""), rcfile) << endmsg;
+				return -1;
+			}
+			
+			current_owner = ConfigVariableBase::System;
+			
+			if (set_state (*tree.root())) {
+				error << string_compose(_("Ardour: system configuration file \"%1\" not loaded successfully."), rcfile) << endmsg;
+				return -1;
+			}
+		} else {
+			error << _("your system Ardour configuration file is empty. This probably means that there as an error installing Ardour") << endmsg;
 		}
 	}
 
@@ -114,23 +128,32 @@ Configuration::load_state ()
 			"ardour.rc", user_rc_file))
 	{
 		XMLTree tree;
-		found = true;
-	
+		
 		string rcfile = user_rc_file.to_string();
 
-		cerr << string_compose (_("loading user configuration file %1"), rcfile) << endl;
+		/* stupid XML parser hates empty files */
 
-		if (!tree.read (rcfile)) {
-			error << string_compose(_("Ardour: cannot read configuration file \"%1\""), rcfile) << endmsg;
+		if (g_stat (rcfile.c_str(), &statbuf)) {
 			return -1;
 		}
 
-		current_owner = ConfigVariableBase::Config;
-
-		if (set_state (*tree.root())) {
-			error << string_compose(_("Ardour: user configuration file \"%1\" not loaded successfully."), rcfile) << endmsg;
-			return -1;
-		}
+		if (statbuf.st_size != 0) {
+			cerr << string_compose (_("loading user configuration file %1"), rcfile) << endl;
+			
+			if (!tree.read (rcfile)) {
+				error << string_compose(_("Ardour: cannot read configuration file \"%1\""), rcfile) << endmsg;
+				return -1;
+			}
+			
+			current_owner = ConfigVariableBase::Config;
+			
+			if (set_state (*tree.root())) {
+				error << string_compose(_("Ardour: user configuration file \"%1\" not loaded successfully."), rcfile) << endmsg;
+				return -1;
+			}
+		} else {
+			warning << _("your Ardour configuration file is empty. This is not normal.") << endmsg;
+		}	
 	}
 
 	if (!found)