Merge pull request #362 from k4yf0ur/vvip174_qol_stuffs

Fixed show card crash and added a refresh on removing styles
aa2g · Oct 19, 2021 · 2834dbd · 2834dbd
2 parents a2792e9 + f6d38aa
commit 2834dbd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/AAUnlimited/Functions/AAEdit/UnlimitedDialog.cpp b/AAUnlimited/Functions/AAEdit/UnlimitedDialog.cpp
@@ -305,6 +305,7 @@ INT_PTR CALLBACK UnlimitedDialog::GNDialog::DialogProc(_In_ HWND hwndDlg,_In_ UI
 						g_currChar.m_cardData.RemoveCardStyle(selRemove);
 					}
 					thisPtr->RefreshAAuSetList();
+					thisPtr->Refresh();
 				}
 				return TRUE;
 			case IDC_GN_BTNAAUSETRENAME:

diff --git a/AAUnlimited/MemMods/AAPlay/Events/Loads.cpp b/AAUnlimited/MemMods/AAPlay/Events/Loads.cpp
@@ -128,9 +128,11 @@ DWORD __declspec(noinline) __stdcall CallOrigLoad(DWORD who, void *_this, DWORD
 		}
 	}
 
-	if (card.m_char->m_xxSkeleton) {
-		card.AddShadows((DWORD*)card.m_char->m_xxSkeleton);
-		card.CastShadows((DWORD*)card.m_char->m_xxSkeleton);
+	if (card.IsValid()) {
+		if (card.m_char->m_xxSkeleton) {
+			card.AddShadows((DWORD*)card.m_char->m_xxSkeleton);
+			card.CastShadows((DWORD*)card.m_char->m_xxSkeleton);
+		}
 	}
 
 	LUA_EVENT_NORET("char_spawn_end", retv, loadCharacter, cloth, a3, a4, partial);