Merge pull request #12 from grumat/dev

Fixed crashes related to fixed paths on OSX
uroni · Jan 7, 2021 · beb3e0b · beb3e0b
2 parents 1b430c4 + a5d086f
commit beb3e0b
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/main.cpp b/main.cpp
@@ -290,6 +290,12 @@ bool MyApp::OnInit()
 	//SetCurrentDirectoryW(ExtractFilePath(buf).c_str() );
 	g_res_path=ConvertToUTF8(ExtractFilePath(buf))+"\\";
 	res_path=wxString(g_res_path.c_str(), wxMBConvUTF8());
+#elif defined(__APPLE__)
+	wxFileName base(wxStandardPaths::Get().GetExecutablePath());
+	base.AppendDir(wxT("share"));
+	base.AppendDir(wxT("urbackup"));
+	res_path=base.GetPathWithSep();
+	g_res_path=res_path;
 #else
 	res_path=wxT(DATADIR "/urbackup/");
 	g_res_path= DATADIR "/urbackup/";