* src/widgets/modest-window-mgr.c:

        * Now it does not crash if we cannot get an uid from one of the
          windows (should happen at least with main window, but also
          with editors) (fixes NB#60430).

pmo-trunk-r2273

diff --git a/src/widgets/modest-window-mgr.c b/src/widgets/modest-window-mgr.c
index 3477b2d..e30be7e 100644 (file)
--- a/src/widgets/modest-window-mgr.c
+++ b/src/widgets/modest-window-mgr.c
@@ -300,7 +300,7 @@ compare_msguids (ModestWindow *win,
        /* Get message uid from msg window */
        msg_uid = modest_msg_view_window_get_message_uid (MODEST_MSG_VIEW_WINDOW (win));
 
        /* Get message uid from msg window */
        msg_uid = modest_msg_view_window_get_message_uid (MODEST_MSG_VIEW_WINDOW (win));
 

-       if (msg_uid && !strcmp (msg_uid, uid))
+       if (msg_uid && uid &&!strcmp (msg_uid, uid))

                return 0;
        else
                return 1;
                return 0;
        else
                return 1;