1 files changed, 34 insertions, 10 deletions

diff --git a/noncore/apps/zsafe/zsafe.cpp b/noncore/apps/zsafe/zsafe.cpp
index ef16b46..e86b3d2 100644
--- a/noncore/apps/zsafe/zsafe.cpp
+++ b/noncore/apps/zsafe/zsafe.cpp
@@ -2599,2 +2599,3 @@ void ZSafe::addCategory()
         QString categ;
+        QString firstCategory;
         dialog->CategoryField->clear(); // remove all items
@@ -2620,2 +2621,4 @@ void ZSafe::addCategory()
                  dialog->CategoryField->insertItem (categ, -1);
+                 if (firstCategory.isEmpty())
+                    firstCategory = categ;
               }
@@ -2626,3 +2629,6 @@ void ZSafe::addCategory()
 
-        setCategoryDialogFields(dialog);
+        if (firstCategory.isEmpty())
+           setCategoryDialogFields(dialog);
+        else
+           setCategoryDialogFields(dialog, firstCategory);
 
@@ -2788,14 +2794,29 @@ void ZSafe::setCategoryDialogFields(CategoryDialog *dialog)
 {
-   dialog->Field1->setText(getFieldLabel (selectedItem, "1", tr("Name")));
-   dialog->Field2->setText(getFieldLabel (selectedItem, "2", tr("Username")));
-   dialog->Field3->setText(getFieldLabel (selectedItem, "3", tr("Password")));
-   dialog->Field4->setText(getFieldLabel (selectedItem, "4", tr("Comment")));
-   dialog->Field5->setText(getFieldLabel (selectedItem, "5", tr("Field 4")));
-   dialog->Field6->setText(getFieldLabel (selectedItem, "6", tr("Field 5")));
+   if (!dialog)
+      return;
 
    QString icon;
-   Category *cat= categories.find (selectedItem->text(0));
-   if (cat)
+   if (selectedItem) 
    {
-      icon = cat->getIconName();
+      dialog->Field1->setText(getFieldLabel (selectedItem, "1", tr("Name")));
+      dialog->Field2->setText(getFieldLabel (selectedItem, "2", tr("Username")));
+      dialog->Field3->setText(getFieldLabel (selectedItem, "3", tr("Password")));
+      dialog->Field4->setText(getFieldLabel (selectedItem, "4", tr("Comment")));
+      dialog->Field5->setText(getFieldLabel (selectedItem, "5", tr("Field 4")));
+      dialog->Field6->setText(getFieldLabel (selectedItem, "6", tr("Field 5")));
+
+      Category *cat= categories.find (selectedItem->text(0));
+      if (cat)
+      {
+         icon = cat->getIconName();
+      }
+   }
+   else
+   {
+      dialog->Field1->setText(tr("Name"));
+      dialog->Field2->setText(tr("Username"));
+      dialog->Field3->setText(tr("Password"));
+      dialog->Field4->setText(tr("Comment"));
+      dialog->Field5->setText(tr("Field 4"));
+      dialog->Field6->setText(tr("Field 5"));
    }
@@ -2840,2 +2861,5 @@ void ZSafe::setCategoryDialogFields(CategoryDialog *dialog, QString category)
 {
+   if (!dialog)
+      return;
+
    dialog->Field1->setText(getFieldLabel (category, "1", tr("Name")));