From a2d66138ffa6a5e886bdbb5fe05ee13a0618d27e Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Sun, 11 Dec 2016 00:06:47 +0100 Subject: don't overwrite the crashreport info that are written before upload MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There was a race condition that the OpenGL code was initialized before the old report has been uploaded. Therefore the OpenGL setting was overwritten by the new start and we were not getting the old value. Now we store any value that wants to be added before the dump.ini is ready in a temporary map and will write them as soon as we write all the common information. This problem was introduced by the dialog requesting permission to upload the crash report. Change-Id: I29391a1ff56bac6381218c5a4aefb58c2c03f024 Reviewed-on: https://gerrit.libreoffice.org/31846 Tested-by: Jenkins Reviewed-by: Markus Mohrhard (cherry picked from commit 80049d110a742060acedb89eaad763e66d7f75a5) Reviewed-on: https://gerrit.libreoffice.org/31851 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- include/desktop/crashreport.hxx | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'include') diff --git a/include/desktop/crashreport.hxx b/include/desktop/crashreport.hxx index e58e387d0122..f4616e88c367 100644 --- a/include/desktop/crashreport.hxx +++ b/include/desktop/crashreport.hxx @@ -57,6 +57,10 @@ private: static osl::Mutex maMutex; + static bool mbInit; + + static std::map maKeyValues; // used to temporarily save entries before the old info has been uploaded + static google_breakpad::ExceptionHandler* mpExceptionHandler; }; -- cgit v1.2.3