Permalink
Browse files

* mu: fix pre-condition warning when getting related messages without…

… threads
  • Loading branch information...
1 parent dbbcaf0 commit 342195a24821ff9f4fdf0ed9693c645fd95f7111 @djcb committed Mar 16, 2013
Showing with 6 additions and 2 deletions.
  1. +4 −1 lib/mu-msg-iter.cc
  2. +1 −0 lib/mu-msg-iter.h
  3. +1 −1 mu/mu-cmd.c
View
@@ -405,7 +405,10 @@ const MuMsgIterThreadInfo*
mu_msg_iter_get_thread_info (MuMsgIter *iter)
{
g_return_val_if_fail (!mu_msg_iter_is_done(iter), NULL);
- g_return_val_if_fail (iter->thread_hash(), NULL);
+
+ /* maybe we don't have thread info */
+ if (!iter->thread_hash())
+ return NULL;
try {
const MuMsgIterThreadInfo *ti;
View
@@ -179,6 +179,7 @@ typedef struct _MuMsgIterThreadInfo MuMsgIterThreadInfo;
/**
* get a the MuMsgThreaderInfo struct for this message; this only
* works when you created the mu-msg-iter with threading enabled
+ * (otherwise, return NULL)
*
* @param iter a valid MuMsgIter iterator
*
View
@@ -529,7 +529,7 @@ show_usage (void)
{
g_print ("usage: mu command [options] [parameters]\n");
g_print ("where command is one of index, find, cfind, view, mkdir, "
- "extract, add, remove, stats, verify or server\n");
+ "extract, add, remove, script, verify or server\n");
g_print ("see the mu, mu-<command> or mu-easy manpages for "
"more information\n");
}

0 comments on commit 342195a

Please sign in to comment.