* Fixes NB#104978, crash in account wizard when language/region do not match

[modest] / src / modest-tny-folder.c

diff --git a/src/modest-tny-folder.c b/src/modest-tny-folder.c
index f01c61d..ee0f224 100644 (file)
--- a/src/modest-tny-folder.c
+++ b/src/modest-tny-folder.c
@@ -30,6 +30,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <string.h>
+#include <modest-defs.h>
 #include <modest-tny-folder.h>
 #include <modest-tny-account.h>
 #include <modest-tny-outbox-account.h>
@@ -432,6 +433,7 @@ modest_tny_folder_has_subfolder_with_name (TnyFolderStore *parent,
                folder = (TnyFolder*)tny_iterator_get_current (iter);
                if (!folder || ! TNY_IS_FOLDER(folder)) {
                        g_warning ("%s: invalid folder", __FUNCTION__);
+                       tny_iterator_next (iter);
                        continue;
                }
                
@@ -439,6 +441,7 @@ modest_tny_folder_has_subfolder_with_name (TnyFolderStore *parent,
                if (!name) {
                        g_warning ("%s: folder name == NULL", __FUNCTION__);
                        g_object_unref (folder);
+                       tny_iterator_next (iter);
                        continue;
                }