[gtksourceview/wip/loader-saver] FileLoader: small bug fixes

[Sébastien Wilmet <swilmet src gnome org>]

commit 38792da8b0713611ef805bf703527b70c5ab4593
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Thu Apr 3 21:26:28 2014 +0200

    FileLoader: small bug fixes

 gtksourceview/gtksourcefileloader.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)
---
diff --git a/gtksourceview/gtksourcefileloader.c b/gtksourceview/gtksourcefileloader.c
index 771cb4c..d4426ca 100644
--- a/gtksourceview/gtksourcefileloader.c
+++ b/gtksourceview/gtksourcefileloader.c
@@ -774,8 +774,6 @@ void
 gtk_source_file_loader_set_candidate_encodings (GtkSourceFileLoader *loader,
                                                GSList              *candidate_encodings)
 {
-       g_return_if_fail (loader->priv->candidate_encodings == NULL);
-
        g_slist_free (loader->priv->candidate_encodings);
        loader->priv->candidate_encodings = g_slist_copy (candidate_encodings);
 }
@@ -925,7 +923,7 @@ gtk_source_file_loader_load_finish (GtkSourceFileLoader  *loader,
 
        ok = g_task_propagate_boolean (G_TASK (result), &real_error);
 
-       if (error != NULL)
+       if (error != NULL && real_error != NULL)
        {
                *error = g_error_copy (real_error);
        }