summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-05-25 09:50:52 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-05-25 09:50:52 +0200
commit7ffe20be0ddcda00e6ef92b90334d74f4f856f9e (patch)
treead4e03841396b386e45997dde3fdf5f3022a2580
parent8a83562dd09fa1c38629e5250f20c4b091e934b1 (diff)
Fix mis-merge
Change-Id: Ia16ac2eec2b31aeb12b90e0f3fb2f3a37940c314
-rw-r--r--desktop/source/app/crashreport.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/desktop/source/app/crashreport.cxx b/desktop/source/app/crashreport.cxx
index f7345a569fd1..c2a569a6e7c2 100644
--- a/desktop/source/app/crashreport.cxx
+++ b/desktop/source/app/crashreport.cxx
@@ -72,8 +72,8 @@ OUString getCrashUserProfileDirectory()
void CrashReporter::updateMinidumpLocation()
{
-#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID
OUString aURL = getCrashUserProfileDirectory();
+#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID
OString aOStringUrl = OUStringToOString(aURL, RTL_TEXTENCODING_UTF8);
google_breakpad::MinidumpDescriptor descriptor(aOStringUrl.getStr());
mpExceptionHandler->set_minidump_descriptor(descriptor);