X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=lib%2Fopen.cc;h=8fc17cafaa939ac8b97b3a7c31f181304ef0d5f4;hp=3bb3e1034e3d7fb1ebb4c1b5d51603e308eb436d;hb=e823d05ae6dc920d4fc9abf774c3d2575d891d7b;hpb=986056bdbcfea642a2d08f7ee257f7aaaed433b9

diff --git a/lib/open.cc b/lib/open.cc
index 3bb3e103..8fc17caf 100644
--- a/lib/open.cc
+++ b/lib/open.cc
@@ -263,6 +263,11 @@ _choose_xapian_path (void *ctx, const char *database_path, const char **xapian_p
     if (status)
 	goto DONE;
 
+    trial_path = talloc_asprintf (ctx, "%s/xapian", database_path);
+    status = _trial_open (trial_path, message_ptr);
+    if (status != NOTMUCH_STATUS_PATH_ERROR)
+	goto DONE;
+
     notmuch_path = talloc_asprintf (ctx, "%s/.notmuch", database_path);
     status = _db_dir_exists (notmuch_path, message_ptr);
     if (status)