Merge accidentally created heads.
authorStephen Pohl <spohl.mozilla.bugs@gmail.com>
Fri, 03 Oct 2014 10:39:01 -0400
changeset 491319 f38d74b29015725c5b20de96cf75d75fa53aca97
parent 491317 d25cccda055f52e6534aa044b0a3f518f6160c0c (current diff)
parent 491318 16dd6a108ff8cd665c9ed4e9b337a6a93c706edf (diff)
child 491320 4cf665f93be3318448b8dc46bda5011dec49c1c8
push id47343
push userbmo:dothayer@mozilla.com
push dateWed, 01 Mar 2017 22:58:58 +0000
milestone35.0a1
Merge accidentally created heads.
--- a/toolkit/crashreporter/client/crashreporter_osx.mm
+++ b/toolkit/crashreporter/client/crashreporter_osx.mm
@@ -802,19 +802,24 @@ void UIError_impl(const string& message)
   }
 
   [gUI showErrorUI: message];
   [NSApp run];
 }
 
 bool UIGetIniPath(string& path)
 {
-  path = gArgv[0];
-  path.append(".ini");
-
+  NSString* tmpPath = [NSString stringWithUTF8String:gArgv[0]];
+  NSString* iniName = [tmpPath lastPathComponent];
+  iniName = [iniName stringByAppendingPathExtension:@"ini"];
+  tmpPath = [tmpPath stringByDeletingLastPathComponent];
+  tmpPath = [tmpPath stringByDeletingLastPathComponent];
+  tmpPath = [tmpPath stringByAppendingPathComponent:@"Resources"];
+  tmpPath = [tmpPath stringByAppendingPathComponent:iniName];
+  path = [tmpPath UTF8String];
   return true;
 }
 
 bool UIGetSettingsPath(const string& vendor,
                        const string& product,
                        string& settingsPath)
 {
   FSRef foundRef;