mirror of https://github.com/odrling/Aegisub
Changed the behaviour of ?data to use GetDataDir(), which should be better for unix
Originally committed to SVN as r1680.
This commit is contained in:
parent
0dfaad3aa4
commit
6c330f12e4
|
@ -53,12 +53,14 @@ StandardPaths *StandardPaths::GetInstance() {
|
||||||
// Constructor
|
// Constructor
|
||||||
StandardPaths::StandardPaths() {
|
StandardPaths::StandardPaths() {
|
||||||
// Get paths
|
// Get paths
|
||||||
wxFileName dataDir(wxStandardPaths::Get().GetExecutablePath());
|
//wxFileName dataDir(wxStandardPaths::Get().GetDataDir());
|
||||||
|
wxString dataDir = wxStandardPaths::Get().GetDataDir();
|
||||||
wxString userDir = wxStandardPaths::Get().GetUserDataDir();
|
wxString userDir = wxStandardPaths::Get().GetUserDataDir();
|
||||||
wxString tempDir = wxStandardPaths::Get().GetTempDir();
|
wxString tempDir = wxStandardPaths::Get().GetTempDir();
|
||||||
|
|
||||||
// Set paths
|
// 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("?user"),userDir);
|
||||||
DoSetPathValue(_T("?temp"),tempDir);
|
DoSetPathValue(_T("?temp"),tempDir);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue