View | Details | Raw Unified | Return to bug 282875 | Differences between
and this patch

Collapse All | Expand All

(-)src/wallet/walletutil.cpp (-2 / +2 lines)
Lines 58-64 Link Here
58
                (ExistsBerkeleyDatabase(it->path()) || ExistsSQLiteDatabase(it->path()))) {
58
                (ExistsBerkeleyDatabase(it->path()) || ExistsSQLiteDatabase(it->path()))) {
59
                // Found a directory which contains wallet.dat btree file, add it as a wallet.
59
                // Found a directory which contains wallet.dat btree file, add it as a wallet.
60
                paths.emplace_back(path);
60
                paths.emplace_back(path);
61
            } else if (it.level() == 0 && it->symlink_status().type() == fs::regular_file && ExistsBerkeleyDatabase(it->path())) {
61
            } else if (it.depth() == 0 && it->symlink_status().type() == fs::regular_file && ExistsBerkeleyDatabase(it->path())) {
62
                if (it->path().filename() == "wallet.dat") {
62
                if (it->path().filename() == "wallet.dat") {
63
                    // Found top-level wallet.dat btree file, add top level directory ""
63
                    // Found top-level wallet.dat btree file, add top level directory ""
64
                    // as a wallet.
64
                    // as a wallet.
Lines 73-79 Link Here
73
            }
73
            }
74
        } catch (const std::exception& e) {
74
        } catch (const std::exception& e) {
75
            LogPrintf("%s: Error scanning %s: %s\n", __func__, it->path().string(), e.what());
75
            LogPrintf("%s: Error scanning %s: %s\n", __func__, it->path().string(), e.what());
76
            it.no_push();
76
            it.disable_recursion_pending();
77
        }
77
        }
78
    }
78
    }
79
79

Return to bug 282875