Merge bitcoin#20308: wallet: Set bilingual error completely

MarcoFalke · MarcoFalke · commit 9bb078351b09 · 2020-11-05T14:51:37.000+01:00
090b838 Set bilingual error completely (Hennadii Stepanov) Pull request description: Fix bitcoin-core/gui#128 ACKs for top commit: MarcoFalke: review ACK 090b838 practicalswift: ACK 090b838: patch looks correct! Tree-SHA512: ef400291a866c3116377a4439a23de89a1c5e3ef4597d682138f88d90612846aabb31228b98a8722e7f58b4b499a58adc732bc40ac28fae6d18fce1d4953c96a
diff --git a/src/wallet/sqlite.cpp b/src/wallet/sqlite.cpp
@@ -584,7 +584,7 @@ std::unique_ptr<SQLiteDatabase> MakeSQLiteDatabase(const fs::path& path, const D
         return db;
     } catch (const std::runtime_error& e) {
         status = DatabaseStatus::FAILED_LOAD;
-        error.original = e.what();
+        error = Untranslated(e.what());
         return nullptr;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -584,7 +584,7 @@ std::unique_ptr<SQLiteDatabase> MakeSQLiteDatabase(const fs::path& path, const D`
`584`	`584`	`return db;`
`585`	`585`	`} catch (const std::runtime_error& e) {`
`586`	`586`	`status = DatabaseStatus::FAILED_LOAD;`
`587`		`- error.original = e.what();`
	`587`	`+ error = Untranslated(e.what());`
`588`	`588`	`return nullptr;`
`589`	`589`	`}`
`590`	`590`	`}`