X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-hildon2-window-mgr.c;h=879a300ec9a40afd19a40390b8c886671ed5aa90;hp=95b6937310d27101efd2a2f766718ed942d38841;hb=15653b82b80a0905f45315e241e525b1b6524a4a;hpb=b6ca27440e1f78d9e5466731fffdce4c70f0db41

diff --git a/src/hildon2/modest-hildon2-window-mgr.c b/src/hildon2/modest-hildon2-window-mgr.c
index 95b6937..879a300 100644
--- a/src/hildon2/modest-hildon2-window-mgr.c
+++ b/src/hildon2/modest-hildon2-window-mgr.c
@@ -499,14 +499,15 @@ modest_hildon2_window_mgr_register_window (ModestWindowMgr *self,
 				return FALSE;
 			}
 			g_free (uid);
-		} else {
+		} else if (header) {
 			if (g_list_find_custom (priv->window_list, header, (GCompareFunc) compare_headers)) {
 				g_debug ("%s found another view window showing the same header", __FUNCTION__);
 				g_object_unref (header);
 				return FALSE;
 			}
 		}
-		g_object_unref (header);
+		if (header)
+			g_object_unref (header);
 	}
 
 	/* Do not go backwards */