From a1f1514038c34c2c9f6c7bfcf6b6747ebae847c0 Mon Sep 17 00:00:00 2001
From: Niels Martin Hansen <nielsm@aegisub.org>
Date: Wed, 3 Jun 2009 23:42:47 +0000
Subject: [PATCH] Remove all traces of local configuration support ("portable
 application") in non-Windows builds. Closes #856.

Originally committed to SVN as r3011.
---
 aegisub/src/dialog_options.cpp | 6 +++++-
 aegisub/src/main.cpp           | 9 +++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/aegisub/src/dialog_options.cpp b/aegisub/src/dialog_options.cpp
index 5656d56b6..b7cd69546 100644
--- a/aegisub/src/dialog_options.cpp
+++ b/aegisub/src/dialog_options.cpp
@@ -114,8 +114,8 @@ DialogOptions::DialogOptions(wxWindow *parent)
 		AddCheckBox(generalPage,genSizer4,_("Show Splash Screen"),_T("Show splash"));
 #ifdef __WXMSW__
 		AddCheckBox(generalPage,genSizer4,_("Auto Check for Updates"),_T("Auto check for updates"));
-#endif
 		AddCheckBox(generalPage,genSizer4,_("Save config.dat locally"),_T("Local config"));
+#endif
 		genSizer4->AddGrowableCol(0,1);
 
 		genSizer1->Add(genSizer4,1,wxEXPAND|wxALL,5);
@@ -904,11 +904,15 @@ void DialogOptions::WriteToOptions(bool justApply) {
 	}
 
 	// Save options
+#ifdef __WXMSW__
 	if (Options.AsBool(_T("Local config"))) Options.SetFile(StandardPaths::DecodePath(_T("?data/config.dat")));
 	else {
+#endif
 		Options.SetFile(StandardPaths::DecodePath(_T("?user/config.dat")));
+#ifdef __WXMSW__
 		wxRemoveFile(StandardPaths::DecodePath(_T("?data/config.dat")));
 	}
+#endif
 	Options.Save();
 
 	// Need restart?
diff --git a/aegisub/src/main.cpp b/aegisub/src/main.cpp
index aac671b10..065093735 100644
--- a/aegisub/src/main.cpp
+++ b/aegisub/src/main.cpp
@@ -153,13 +153,18 @@ bool AegisubApp::OnInit() {
 
 		// Set config file
 		StartupLog(_T("Load configuration"));
-		Options.SetFile(StandardPaths::DecodePath(_T("?data/config.dat")));
 		Options.LoadDefaults();
+#ifndef __WXMSW__
+		Options.SetFile(StandardPaths::DecodePath(_T("?data/config.dat")));
 		Options.Load();
-		if (!Options.AsBool(_T("Local config"))) {
+		if (!Options.AsBool(_T("Local config")))
+#endif
+		{
 			Options.SetFile(StandardPaths::DecodePath(_T("?user/config.dat")));
 			Options.Load();
+#ifndef __WXMSW__
 			wxRemoveFile(StandardPaths::DecodePath(_T("?data/config.dat")));
+#endif
 		}
 		StartupLog(_T("Store options back"));
 		Options.SetInt(_T("Last Version"),GetSVNRevision());