[Libreoffice-commits] core.git: desktop/source

[Stephan Bergmann]

 desktop/source/app/crashreport.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7ffe20be0ddcda00e6ef92b90334d74f4f856f9e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed May 25 09:50:52 2016 +0200

    Fix mis-merge
    
    Change-Id: Ia16ac2eec2b31aeb12b90e0f3fb2f3a37940c314

diff --git a/desktop/source/app/crashreport.cxx b/desktop/source/app/crashreport.cxx
index f7345a5..c2a569a 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);