From d8a9bac4b0673c9445616e38c45b47438f7d1882 Mon Sep 17 00:00:00 2001
From: Amar Takhar <verm@aegisub.org>
Date: Sun, 13 Jun 2010 01:29:32 +0000
Subject: [PATCH] Handle the lack of a pre-existing config file.

Originally committed to SVN as r4489.
---
 aegisub/libaegisub/common/option.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/aegisub/libaegisub/common/option.cpp b/aegisub/libaegisub/common/option.cpp
index dec290ef1..9f89bceb8 100644
--- a/aegisub/libaegisub/common/option.cpp
+++ b/aegisub/libaegisub/common/option.cpp
@@ -28,6 +28,7 @@
 #include "libaegisub/cajun/elements.h"
 #endif
 
+#include "libaegisub/access.h"
 #include "libaegisub/io.h"
 #include "libaegisub/log.h"
 
@@ -54,7 +55,15 @@ void Options::ConfigNext(std::istream& stream) {
 }
 
 void Options::ConfigUser() {
-	std::istream *stream = agi::io::Open(config_file);
+	std::istream *stream;
+
+	try {
+		stream = agi::io::Open(config_file);
+	} catch (const acs::AcsNotFound&) {
+		return;
+	}
+
+	/// @todo Handle other errors such as parsing and notifying the user.
 	LoadConfig(*stream);
 	config_loaded = true;
 	delete stream;