From efef8c19c19a41f29f2b2f3e856d787dbd638f00 Mon Sep 17 00:00:00 2001 From: Brian Pellin Date: Mon, 25 Oct 2010 19:16:08 -0500 Subject: [PATCH] Fix crash on saving new entries. --- src/com/keepassdroid/EntryEditActivity.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/com/keepassdroid/EntryEditActivity.java b/src/com/keepassdroid/EntryEditActivity.java index 647aea6ad..2bb31f5da 100644 --- a/src/com/keepassdroid/EntryEditActivity.java +++ b/src/com/keepassdroid/EntryEditActivity.java @@ -178,9 +178,13 @@ public class EntryEditActivity extends LockCloseActivity { newEntry.binaryDesc = mEntry.binaryDesc; newEntry.groupId = mEntry.groupId; - // Keep previous icon, if no new one was selected - if (-1 == mSelectedIconID) { - newEntry.icon = mEntry.icon; + if (mSelectedIconID == -1) { + if (mIsNew) { + newEntry.icon = App.getDB().pm.iconFactory.getIcon(0); + } else { + // Keep previous icon, if no new one was selected + newEntry.icon = mEntry.icon; + } } else { newEntry.icon = App.getDB().pm.iconFactory.getIcon(mSelectedIconID);