diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-07-10 12:06:15 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-07-10 12:06:19 +0200 |
| commit | 410774ab89fd8aa70773ff44aa1e7a8d7c7c2cad (patch) | |
| tree | 27297b24e99388a7182235bfb5402d468ea7981c /src/qt/splashscreen.cpp | |
| parent | 1fb747a8007caa922b29a69408c2152ba5575db5 (diff) | |
| parent | df695db3237571c662a4e199709f9c6615ffa0c5 (diff) | |
| download | bitcoin-410774ab89fd8aa70773ff44aa1e7a8d7c7c2cad.tar.xz | |
Merge #16359: 0.18: Backport "qt: Assert QMetaObject::invokeMethod result"
df695db3237571c662a4e199709f9c6615ffa0c5 qt: Assert QMetaObject::invokeMethod result (João Barbosa)
e2f7677bdeb15d1517520ddc3e95e42ca13f721a gui: Fix missing qRegisterMetaType(WalletModel*) (João Barbosa)
Pull request description:
ACKs for top commit:
hebasto:
ACK df695db3237571c662a4e199709f9c6615ffa0c5, I have not tested the code, but I have reviewed it and it looks OK, I agree it can be merged.
laanwj:
ACK df695db3237571c662a4e199709f9c6615ffa0c5
Tree-SHA512: 5ce162e59331f6da8ae9ba41eff809881442fab93d65362b5f67aba19da76a72362f0daba9ad1f909478bf26f2daf53b110a0486d7b29b23b3716a7cd7177922
Diffstat (limited to 'src/qt/splashscreen.cpp')
| -rw-r--r-- | src/qt/splashscreen.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp index 0126a2920e..61696ace1a 100644 --- a/src/qt/splashscreen.cpp +++ b/src/qt/splashscreen.cpp @@ -156,11 +156,12 @@ void SplashScreen::finish() static void InitMessage(SplashScreen *splash, const std::string &message) { - QMetaObject::invokeMethod(splash, "showMessage", + bool invoked = QMetaObject::invokeMethod(splash, "showMessage", Qt::QueuedConnection, Q_ARG(QString, QString::fromStdString(message)), Q_ARG(int, Qt::AlignBottom|Qt::AlignHCenter), Q_ARG(QColor, QColor(55,55,55))); + assert(invoked); } static void ShowProgress(SplashScreen *splash, const std::string &title, int nProgress, bool resume_possible) |