Removing redundant if conditional branch

mohabouje · mohabouje · commit 57d19dd02dbc · 2026-01-09T10:08:20.000+04:00
diff --git a/src/wintoastlib.cpp b/src/wintoastlib.cpp
@@ -107,7 +107,7 @@ namespace DllImporter {
         if (initialized()) {
             return S_OK;
         }
-        
+
         LibShell32 = LoadLibraryW(L"SHELL32.DLL");
         HRESULT hr =
             loadFunctionFromLibrary(LibShell32, "SetCurrentProcessExplicitAppUserModelID", SetCurrentProcessExplicitAppUserModelID);
@@ -861,13 +861,11 @@ INT64 WinToast::showToast(_In_ WinToastTemplate const& toast, _In_ IWinToastHand
                                 }
 
                                 if (SUCCEEDED(hr)) {
-                                    if (SUCCEEDED(hr)) {
-                                        _buffer.emplace(id, NotifyData(notification, activatedToken, dismissedToken, failedToken));
-                                        DEBUG_MSG("xml: " << Util::AsString(xmlDocument));
-                                        hr = notifier->Show(notification.Get());
-                                        if (FAILED(hr)) {
-                                            setError(error, WinToastError::NotDisplayed);
-                                        }
+                                    _buffer.emplace(id, NotifyData(notification, activatedToken, dismissedToken, failedToken));
+                                    DEBUG_MSG("xml: " << Util::AsString(xmlDocument));
+                                    hr = notifier->Show(notification.Get());
+                                    if (FAILED(hr)) {
+                                        setError(error, WinToastError::NotDisplayed);
                                     }
                                 }
                             }

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ namespace DllImporter {`
`107`	`107`	`if (initialized()) {`
`108`	`108`	`return S_OK;`
`109`	`109`	`}`
`110`		`-`
	`110`	`+`
`111`	`111`	`LibShell32 = LoadLibraryW(L"SHELL32.DLL");`
`112`	`112`	`HRESULT hr =`
`113`	`113`	`loadFunctionFromLibrary(LibShell32, "SetCurrentProcessExplicitAppUserModelID", SetCurrentProcessExplicitAppUserModelID);`
`@@ -861,13 +861,11 @@ INT64 WinToast::showToast(_In_ WinToastTemplate const& toast, _In_ IWinToastHand`
`861`	`861`	`}`
`862`	`862`
`863`	`863`	`if (SUCCEEDED(hr)) {`
`864`		`- if (SUCCEEDED(hr)) {`
`865`		`- _buffer.emplace(id, NotifyData(notification, activatedToken, dismissedToken, failedToken));`
`866`		`- DEBUG_MSG("xml: " << Util::AsString(xmlDocument));`
`867`		`- hr = notifier->Show(notification.Get());`
`868`		`- if (FAILED(hr)) {`
`869`		`- setError(error, WinToastError::NotDisplayed);`
`870`		`- }`
	`864`	`+ _buffer.emplace(id, NotifyData(notification, activatedToken, dismissedToken, failedToken));`
	`865`	`+ DEBUG_MSG("xml: " << Util::AsString(xmlDocument));`
	`866`	`+ hr = notifier->Show(notification.Get());`
	`867`	`+ if (FAILED(hr)) {`
	`868`	`+ setError(error, WinToastError::NotDisplayed);`
`871`	`869`	`}`
`872`	`870`	`}`
`873`	`871`	`}`