From 2d4032d83b78ad67938b8d57d12f4046da8be508 Mon Sep 17 00:00:00 2001
From: Rodrigo Braz Monteiro <zeratul@cellosoft.com>
Date: Thu, 21 Jun 2007 06:52:15 +0000
Subject: [PATCH] Improved loading of config.dat

Originally committed to SVN as r1281.
---
 aegisub/ass_style_storage.cpp | 2 +-
 aegisub/main.cpp              | 3 +++
 aegisub/options.cpp           | 3 ---
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/aegisub/ass_style_storage.cpp b/aegisub/ass_style_storage.cpp
index 5476049a7..f4f3dbadd 100644
--- a/aegisub/ass_style_storage.cpp
+++ b/aegisub/ass_style_storage.cpp
@@ -64,7 +64,7 @@ void AssStyleStorage::Load(wxString name) {
 	if (name.IsEmpty()) return;
 	Clear();
 
-	TextFileReader file(StandardPaths::DecodePath(_T("?data/catalog/")+name+_T(".sty")), _T("UTF-8"));
+	TextFileReader file(StandardPaths::DecodePath(_T("?user/catalog/")+name+_T(".sty")), _T("UTF-8"));
 
 	AssStyle *curStyle;
 	while (file.HasMoreLines()) {
diff --git a/aegisub/main.cpp b/aegisub/main.cpp
index 5287f9718..c61e61efd 100644
--- a/aegisub/main.cpp
+++ b/aegisub/main.cpp
@@ -43,6 +43,7 @@
 #include <wx/mimetype.h>
 #include <wx/utils.h>
 #include <wx/stdpaths.h>
+#include <wx/filefn.h>
 #include "main.h"
 #include "frame_main.h"
 #include "options.h"
@@ -88,10 +89,12 @@ bool AegisubApp::OnInit() {
 
 		// Set config file
 		Options.SetFile(StandardPaths::DecodePath(_T("?data/config.dat")));
+		Options.LoadDefaults();
 		Options.Load();
 		if (!Options.AsBool(_T("Local config"))) {
 			Options.SetFile(StandardPaths::DecodePath(_T("?user/config.dat")));
 			Options.Load();
+			wxRemoveFile(StandardPaths::DecodePath(_T("?data/config.dat")));
 		}
 		Options.Save();
 		AssTime::UseMSPrecision = Options.AsBool(_T("Use nonstandard Milisecond Times"));
diff --git a/aegisub/options.cpp b/aegisub/options.cpp
index ea5ce9c1b..e0a14cc87 100644
--- a/aegisub/options.cpp
+++ b/aegisub/options.cpp
@@ -392,9 +392,6 @@ void OptionsManager::Save() {
 ////////
 // Load
 void OptionsManager::Load() {
-	// Load defaults
-	LoadDefaults();
-
 	// Check if file exists
 	wxFileName path(filename);
 	if (!path.FileExists()) {