Skip to content

Commit c997f88

Browse files
author
MarcoFalke
committed
Merge #12416: Fix Windows build errors introduced in #10498
f40df29 Fix Windows build errors introduced in #10498 (practicalswift) Pull request description: Fix Windows build errors introduced in #10498 Fixes #12386 cc @ken2812221, @Sjors, @MarcoFalke and @floreslorca Tree-SHA512: a807521fbd4015971e646fa4bab5495a3aaa97337e7b7d80b9161f33778e84ad6725cf4fbd5a35b50bf3a2bd97747cd7a630b51493ff516c2e1ad74acce148be
2 parents 5dc00f6 + f40df29 commit c997f88

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/qt/bitcoin.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,7 @@ int main(int argc, char *argv[])
706706
if (BitcoinCore::baseInitialize()) {
707707
app.requestInitialize();
708708
#if defined(Q_OS_WIN) && QT_VERSION >= 0x050000
709-
WinShutdownMonitor::registerShutdownBlockReason(QObject::tr("%1 didn't yet exit safely...").arg(QObject::tr(PACKAGE_NAME)), static_cast<HWND>(app.getMainWinId()));
709+
WinShutdownMonitor::registerShutdownBlockReason(QObject::tr("%1 didn't yet exit safely...").arg(QObject::tr(PACKAGE_NAME)), (HWND)app.getMainWinId());
710710
#endif
711711
app.exec();
712712
app.requestShutdown();

src/qt/winshutdownmonitor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ bool WinShutdownMonitor::nativeEventFilter(const QByteArray &eventType, void *pM
5656
void WinShutdownMonitor::registerShutdownBlockReason(const QString& strReason, const HWND& mainWinId)
5757
{
5858
typedef BOOL (WINAPI *PSHUTDOWNBRCREATE)(HWND, LPCWSTR);
59-
PSHUTDOWNBRCREATE shutdownBRCreate = static_cast<PSHUTDOWNBRCREATE>(GetProcAddress(GetModuleHandleA("User32.dll"), "ShutdownBlockReasonCreate"));
59+
PSHUTDOWNBRCREATE shutdownBRCreate = (PSHUTDOWNBRCREATE)GetProcAddress(GetModuleHandleA("User32.dll"), "ShutdownBlockReasonCreate");
6060
if (shutdownBRCreate == nullptr) {
6161
qWarning() << "registerShutdownBlockReason: GetProcAddress for ShutdownBlockReasonCreate failed";
6262
return;

0 commit comments

Comments
 (0)