diff options
| author | Jeff Garzik <jgarzik@bitpay.com> | 2013-10-22 07:25:54 -0700 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@bitpay.com> | 2013-10-22 07:25:54 -0700 |
| commit | fcb9f264668f4bb335e1201770d84884bb7a226e (patch) | |
| tree | 2f82a6eae2594034c6dca7af07d5c79d363b438d /src/qt | |
| parent | b3dd90c1227919c5d4fd6a77961da36f3f35ac8c (diff) | |
| parent | 406b1f05f61a7bba7ef6860c031a7a7c3e019100 (diff) | |
| download | bitcoin-fcb9f264668f4bb335e1201770d84884bb7a226e.tar.xz | |
Merge pull request #3127 from jgarzik/smells-like-json-spirit
Revert recent json-spirit changes
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/rpcconsole.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp index e31310c2b6..e7dcdf62a1 100644 --- a/src/qt/rpcconsole.cpp +++ b/src/qt/rpcconsole.cpp @@ -159,7 +159,7 @@ void RPCExecutor::request(const QString &command) else if (result.type() == json_spirit::str_type) strPrint = result.get_str(); else - strPrint = write_string(result, json_spirit::pretty_print | json_spirit::raw_utf8); + strPrint = write_string(result, true); emit reply(RPCConsole::CMD_REPLY, QString::fromStdString(strPrint)); } @@ -173,7 +173,7 @@ void RPCExecutor::request(const QString &command) } catch(std::runtime_error &) // raised when converting to invalid type, i.e. missing code or message { // Show raw JSON object - emit reply(RPCConsole::CMD_ERROR, QString::fromStdString(write_string(json_spirit::Value(objError), json_spirit::raw_utf8))); + emit reply(RPCConsole::CMD_ERROR, QString::fromStdString(write_string(json_spirit::Value(objError), false))); } } catch (std::exception& e) |