From 2cba4ea9672f1c308f7c5fa09ca775b77cdebf53 Mon Sep 17 00:00:00 2001 From: Ximeng Zu Date: Tue, 11 Jul 2017 22:34:00 -0500 Subject: [PATCH] [Android Viewer] Fix crash after save dialog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixed the crash after save dialog caused by a possible null pointer related to presentation mode. Change-Id: I2fcf254f4382eaa5b565e25679486a5158d56eac Reviewed-on: https://gerrit.libreoffice.org/39847 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl --- .../src/java/org/libreoffice/LibreOfficeMainActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java index 95c90de9b69a..8354dca63aa3 100755 --- a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java +++ b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java @@ -414,7 +414,7 @@ public class LibreOfficeMainActivity extends AppCompatActivity implements Settin // noinspection ResultOfMethodCallIgnored mTempFile.delete(); } - if (mTempSlideShowFile.exists()) { + if (mTempSlideShowFile != null && mTempSlideShowFile.exists()) { // noinspection ResultOfMethodCallIgnored mTempSlideShowFile.delete(); }