diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-08 15:11:27 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-08 15:11:27 +0000 |
| commit | f3bcaf9f88aad2c423ebcd61121562f9834187d4 (patch) | |
| tree | f22238c29b57707b645a350940e3e9bdf3ce1f5d /widget/windows/nsWindow.cpp | |
| parent | Adding debian version 115.7.0esr-1~deb12u1. (diff) | |
| download | firefox-esr-f3bcaf9f88aad2c423ebcd61121562f9834187d4.tar.xz firefox-esr-f3bcaf9f88aad2c423ebcd61121562f9834187d4.zip | |
Merging upstream version 115.8.0esr.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rw-r--r-- | widget/windows/nsWindow.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp index 7f925a6ef8..e4b733486b 100644 --- a/widget/windows/nsWindow.cpp +++ b/widget/windows/nsWindow.cpp @@ -3279,7 +3279,10 @@ void nsWindow::SetCursor(const Cursor& aCursor) { sCurrentHCursorIsCustom = false; sCurrentCursor = aCursor; - HCURSOR cursor = CursorForImage(aCursor, GetDefaultScale()); + HCURSOR cursor = nullptr; + if (mCustomCursorAllowed) { + cursor = CursorForImage(aCursor, GetDefaultScale()); + } bool custom = false; if (cursor) { custom = true; |