1 files changed, 9 insertions, 4 deletions

diff --git a/src/namestore/gnunet-namestore-gtk.c b/src/namestore/gnunet-namestore-gtk.c
index 9f21abbd..337cc043 100644
--- a/src/namestore/gnunet-namestore-gtk.c
+++ b/src/namestore/gnunet-namestore-gtk.c
@@ -973,8 +973,10 @@ edit_dialog_continuation (struct GNUNET_GTK_NAMESTORE_PluginEnvironment *edc,
     free_edit_dialog_context (edc);
     return;
   }
-  if (GNUNET_OK != GNUNET_GNSRECORD_string_to_value (edc->record_type, edc->n_value,
-                                                     &data, &data_size))
+  if (GNUNET_OK !=
+      GNUNET_GNSRECORD_string_to_value (edc->record_type,
+                                        edc->n_value,
+                                        &data, &data_size))
   {
     GNUNET_break (0);
     free_edit_dialog_context (edc);
@@ -1600,7 +1602,6 @@ launch_edit_dialog (gint n_type,
   edc->off = off;
   edc->name = GNUNET_strdup (name);
   edc->new_zone_option = g_strdup (current_zone_option);
-  edc->record_type = n_type;
   edc->zone_liststore = zone_liststore;
   edc->check_validity = &check_validity;
   GNUNET_asprintf (&edc->liblow,
@@ -1608,7 +1609,11 @@ launch_edit_dialog (gint n_type,
                    GNUNET_GNSRECORD_number_to_typename (n_type));
   GNUNET_STRINGS_utf8_tolower (edc->liblow,
                                edc->liblow);
-   edc->plugin = GNUNET_PLUGIN_load (edc->liblow, edc);
+  edc->plugin = GNUNET_PLUGIN_load (edc->liblow, edc);
+  if (0 != edc->plugin->record_type)
+    edc->record_type = edc->plugin->record_type;
+  else
+    edc->record_type = n_type;
   if (NULL == edc->plugin)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,