OSDN Git Service

Update CWindowsManagerDialog - check some pointers for null and made … (#824) (2)
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sun, 13 Jun 2021 13:57:22 +0000 (22:57 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sun, 13 Jun 2021 13:57:22 +0000 (22:57 +0900)
Src/WindowsManagerDialog.cpp

index 857ba81..b88ea19 100644 (file)
@@ -118,7 +118,11 @@ void CWindowsManagerDialog::PopulateList()
                sText.Empty();
                HICON hIcon = pArrChild->GetAt(i)->GetIcon(FALSE);
                if (NULL == hIcon)
-                       hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
+               {
+                       hIcon = pArrChild->GetAt(i)->GetIcon(TRUE);
+                       if (NULL == hIcon)
+                               hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
+               }
                m_pIL->Add(hIcon);
                const CDocument* pDoc = pArrChild->GetAt(i)->GetActiveDocument();
                if (nullptr != pDoc)