From 6c330f12e40bec4fd86fdb319432e793f884b8c5 Mon Sep 17 00:00:00 2001 From: Rodrigo Braz Monteiro Date: Fri, 11 Jan 2008 01:57:30 +0000 Subject: [PATCH] Changed the behaviour of ?data to use GetDataDir(), which should be better for unix Originally committed to SVN as r1680. --- aegisub/standard_paths.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/aegisub/standard_paths.cpp b/aegisub/standard_paths.cpp index 02c984028..15f7ac2d7 100644 --- a/aegisub/standard_paths.cpp +++ b/aegisub/standard_paths.cpp @@ -53,12 +53,14 @@ StandardPaths *StandardPaths::GetInstance() { // Constructor StandardPaths::StandardPaths() { // Get paths - wxFileName dataDir(wxStandardPaths::Get().GetExecutablePath()); + //wxFileName dataDir(wxStandardPaths::Get().GetDataDir()); + wxString dataDir = wxStandardPaths::Get().GetDataDir(); wxString userDir = wxStandardPaths::Get().GetUserDataDir(); wxString tempDir = wxStandardPaths::Get().GetTempDir(); // Set paths - DoSetPathValue(_T("?data"),dataDir.GetPath(wxPATH_GET_VOLUME,wxPATH_NATIVE)); + //DoSetPathValue(_T("?data"),dataDir.GetPath(wxPATH_GET_VOLUME,wxPATH_NATIVE)); + DoSetPathValue(_T("?data"),dataDir); DoSetPathValue(_T("?user"),userDir); DoSetPathValue(_T("?temp"),tempDir);