From 0277967b539e2b0179f9a2619fcff5c4ee745605 Mon Sep 17 00:00:00 2001 From: djcb Date: Sat, 21 Dec 2013 10:14:31 -0800 Subject: [PATCH] * mu-store-read: cleanup function a bit (fruitlessly trying to track down https://code.google.com/p/mu0/issues/detail?id=80) --- lib/mu-store-read.cc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/mu-store-read.cc b/lib/mu-store-read.cc index 7cd92104..2dc4c16b 100644 --- a/lib/mu-store-read.cc +++ b/lib/mu-store-read.cc @@ -131,11 +131,17 @@ char* mu_store_get_metadata (const MuStore *store, const char *key, GError **err) { g_return_val_if_fail (store, NULL); + g_return_val_if_fail (store->db_read_only(), NULL); g_return_val_if_fail (key, NULL); try { - const std::string val (store->db_read_only()->get_metadata (key)); - return val.empty() ? NULL : g_strdup (val.c_str()); + std::string val; + + val = store->db_read_only()->get_metadata (key); + if (!val.empty()) + return g_strdup (val.c_str()); + else + return NULL; } MU_XAPIAN_CATCH_BLOCK_G_ERROR_RETURN(err, MU_ERROR_XAPIAN, NULL); }