Fix behavior when saving after canceling entry edit

* Fixes #3141
* Clearing the entry edit widget prior to emitting the editFinished signal caused the widget to be marked modified and prevent new entries from being created. Use an explicit boolean to notify commit success.
* Don't clear password generator on canceling a cancel
* Don't discard changes if saving from a cancel produces an error

src/gui/entry/EditEntryWidget.cpp

@@ -962,25 +962,25 @@ void EditEntryWidget::cancel()
         m_entry->setIcon(Entry::DefaultIconNumber);
     }
 
+    bool accepted = false;
     if (isModified()) {
         auto result = MessageBox::question(this,
                                            QString(),
                                            tr("Entry has unsaved changes"),
                                            MessageBox::Cancel | MessageBox::Save | MessageBox::Discard,
                                            MessageBox::Cancel);
         if (result == MessageBox::Cancel) {
-            m_mainUi->passwordGenerator->reset();
             return;
-        }
-        if (result == MessageBox::Save) {
-            commitEntry();
-            setModified(false);
+        } else if (result == MessageBox::Save) {
+            accepted = true;
+            if (!commitEntry()) {
+                return;
+            }
         }
     }
 
     clear();
-
-    emit editFinished(!isModified());
+    emit editFinished(accepted);
 }
 
 void EditEntryWidget::clear()