diff --git a/checkin_notes b/checkin_notes index 63a0084e18..862344d2f7 100644 --- a/checkin_notes +++ b/checkin_notes @@ -619,7 +619,7 @@ Rom 16 Jan 2012 version.h Charlie 17 Jan 2012 - - Mac: In permissions error alert: show branded name, if permissions + - Mac: In permissions error alert: show branded name; if permissions error is in a subdirectory, show path to bad file or subdirectory. client/ diff --git a/clientgui/BOINCGUIApp.cpp b/clientgui/BOINCGUIApp.cpp index 0970384cae..e5d0bb14e0 100644 --- a/clientgui/BOINCGUIApp.cpp +++ b/clientgui/BOINCGUIApp.cpp @@ -340,13 +340,18 @@ bool CBOINCGUIApp::OnInit() { m_pSkinManager->GetAdvanced()->GetApplicationShortName().c_str() ); } else { - wxString strErrorPath = wxString::FromUTF8(path_to_error); strDialogMessage.Printf( - _("%s ownership or permissions are not set properly; please reinstall %s.\n(Error code %d at %s)"), + _("%s ownership or permissions are not set properly; please reinstall %s.\n(Error code %d"), m_pSkinManager->GetAdvanced()->GetApplicationShortName().c_str(), m_pSkinManager->GetAdvanced()->GetApplicationShortName().c_str(), - iErrorCode , strErrorPath.c_str() + iErrorCode ); + if (path_to_error[0]) { + strDialogMessage += _(" at "); + strDialogMessage += wxString::FromUTF8(path_to_error); + } + strDialogMessage += _(")"); + fprintf(stderr, "%ls ownership or permissions are not set properly; please reinstall %ls.\n(Error code %d at %s)", m_pSkinManager->GetAdvanced()->GetApplicationShortName().c_str(), m_pSkinManager->GetAdvanced()->GetApplicationShortName().c_str(),