diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-12-11 00:06:47 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-12-11 20:52:21 +0000 |
| commit | 831d6c879b8a03bdf71215e0b3719a86f6842f95 (patch) | |
| tree | 8fd26516015ba649cdd843444e4234584f267c74 /include | |
| parent | abf54716da33b8252c32b545bd02b33eef3b9a07 (diff) | |
don't overwrite the crashreport info that are written before upload
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 <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit 80049d110a742060acedb89eaad763e66d7f75a5)
Reviewed-on: https://gerrit.libreoffice.org/31850
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/desktop/crashreport.hxx | 4 |
1 files changed, 4 insertions, 0 deletions
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<OUString, OUString> maKeyValues; // used to temporarily save entries before the old info has been uploaded + static google_breakpad::ExceptionHandler* mpExceptionHandler; }; |