[tor-commits] [tor-browser] 217/311: Bug 1751010: Don't change window icon for Private Windows unless privacySegmentation has been enabled. r=mhowell a=dmeehan

[gitolite role]

This is an automated email from the git hooks/post-receive script.

pierov pushed a commit to branch geckoview-99.0.1-11.0-1
in repository tor-browser.

commit 4345fda2f9ab4456fbef41d1d420a3bcbb5138f8
Author: Ben Hearsum <bhearsum at mozilla.com>
AuthorDate: Thu Mar 17 13:28:49 2022 +0000

    Bug 1751010: Don't change window icon for Private Windows unless privacySegmentation has been enabled. r=mhowell a=dmeehan
    
    This was an oversight in the original patch here :(
    
    Differential Revision: https://phabricator.services.mozilla.com/D141269
---
 widget/windows/nsWindow.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp
index ea623d4df541c..69abb58ef4f53 100644
--- a/widget/windows/nsWindow.cpp
+++ b/widget/windows/nsWindow.cpp
@@ -994,11 +994,11 @@ nsresult nsWindow::Create(nsIWidget* aParent, nsNativeWidget aNativeParent,
           PropVariantClear(&pv);
         }
       }
+      HICON icon = ::LoadIconW(::GetModuleHandleW(nullptr),
+                               MAKEINTRESOURCEW(IDI_PBMODE));
+      SetBigIcon(icon);
+      SetSmallIcon(icon);
     }
-    HICON icon =
-        ::LoadIconW(::GetModuleHandleW(nullptr), MAKEINTRESOURCEW(IDI_PBMODE));
-    SetBigIcon(icon);
-    SetSmallIcon(icon);
   }
 
   mDeviceNotifyHandle = InputDeviceUtils::RegisterNotification(mWnd);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.