fixed logical error in SetIcons(): only assert if no icon was set, at least one is OK

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59907 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index 3136e36631a5f52a5e7b2a3436d0e065432147b3..41c488a6254428dd0fdd5c2d7fa82c262ba1720b 100644 (file)
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -1011,8 +1011,12 @@ void wxTopLevelWindowMSW::SetIcons(const wxIconBundle& icons)
         return;
     }
 
         return;
     }
 

-    if ( !DoSelectAndSetIcon(icons, SM_CXSMICON, SM_CYSMICON, ICON_SMALL) &&
-            !DoSelectAndSetIcon(icons, SM_CXICON, SM_CYICON, ICON_BIG) )
+    bool anySet =
+        DoSelectAndSetIcon(icons, SM_CXSMICON, SM_CYSMICON, ICON_SMALL);
+    if ( DoSelectAndSetIcon(icons, SM_CXICON, SM_CYICON, ICON_BIG) )
+        anySet = true;
+
+    if ( !anySet )

     {
         wxFAIL_MSG( "icon bundle doesn't contain any suitable icon" );
     }
     {
         wxFAIL_MSG( "icon bundle doesn't contain any suitable icon" );
     }