1 files changed, 8 insertions, 0 deletions

diff --git a/src/core/Streaming.cpp b/src/core/Streaming.cpp
index 03b49fd6..dae7fadb 100644
--- a/src/core/Streaming.cpp
+++ b/src/core/Streaming.cpp
@@ -509,10 +509,18 @@ CStreaming::ConvertBufferToObject(int8 *buf, int32 streamId)
 		mi = CModelInfo::GetModelInfo(streamId);
 
 		// Txd has to be loaded
+#ifdef FIX_BUGS
+		if(!HasTxdLoaded(mi->GetTxdSlot())){
+#else
+		// texDict will exist even if only first part has loaded
 		if(CTxdStore::GetSlot(mi->GetTxdSlot())->texDict == nil){
+#endif
 			debug("failed to load %s because TXD %s is not in memory\n", mi->GetName(), CTxdStore::GetTxdName(mi->GetTxdSlot()));
 			RemoveModel(streamId);
+#ifndef FIX_BUGS
+			// if we're just waiting for it to load, don't remove this
 			RemoveTxd(mi->GetTxdSlot());
+#endif
 			ReRequestModel(streamId);
 			RwStreamClose(stream, &mem);
 			return false;