Merge pull request #3691
a143d4c
Fix crash in importwallet and dumpwallet formatting (Wladimir J. van der Laan)
This commit is contained in:
commit
0a0cf14337
1 changed files with 3 additions and 3 deletions
|
@ -23,13 +23,13 @@ using namespace std;
|
|||
void EnsureWalletIsUnlocked();
|
||||
|
||||
std::string static EncodeDumpTime(int64_t nTime) {
|
||||
return DateTimeStrFormat("%Y-%m-%"PRId64"T%H:%M:%SZ", nTime);
|
||||
return DateTimeStrFormat("%Y-%m-%dT%H:%M:%SZ", nTime);
|
||||
}
|
||||
|
||||
int64_t static DecodeDumpTime(const std::string &str) {
|
||||
static boost::posix_time::time_input_facet facet("%Y-%m-%dT%H:%M:%SZ");
|
||||
static const boost::posix_time::ptime epoch = boost::posix_time::from_time_t(0);
|
||||
const std::locale loc(std::locale::classic(), &facet);
|
||||
static const std::locale loc(std::locale::classic(),
|
||||
new boost::posix_time::time_input_facet("%Y-%m-%dT%H:%M:%SZ"));
|
||||
std::istringstream iss(str);
|
||||
iss.imbue(loc);
|
||||
boost::posix_time::ptime ptime(boost::date_time::not_a_date_time);
|
||||
|
|
Loading…
Reference in a new issue