@@ -120,6 +120,7 @@ private object GetCoreSyncSettings(Type t, Type syncSettingsType)
120
120
public GameInfo Game { get ; private set ; }
121
121
public RomGame Rom { get ; private set ; }
122
122
public string CanonicalFullPath { get ; private set ; }
123
+ public XmlGame XMLGameInfo = null ;
123
124
124
125
public bool Deterministic { get ; set ; }
125
126
@@ -682,14 +683,22 @@ private static bool IsDiscForXML(string system, string path)
682
683
return Disc . IsValidExtension ( ext ) ;
683
684
}
684
685
685
- private bool LoadXML ( string path , CoreComm nextComm , HawkFile file , string forcedCoreName , out IEmulator nextEmulator , out RomGame rom , out GameInfo game )
686
+ private bool LoadXML (
687
+ string path ,
688
+ CoreComm nextComm ,
689
+ HawkFile file ,
690
+ string forcedCoreName ,
691
+ out IEmulator nextEmulator ,
692
+ out RomGame rom ,
693
+ out GameInfo game ,
694
+ out XmlGame xmlGame )
686
695
{
687
696
nextEmulator = null ;
688
697
rom = null ;
689
698
game = null ;
690
699
try
691
700
{
692
- var xmlGame = XmlGame . Create ( file ) ; // if load fails, are we supposed to retry as a bsnes XML????????
701
+ xmlGame = XmlGame . Create ( file ) ; // if load fails, are we supposed to retry as a bsnes XML????????
693
702
game = xmlGame . GI ;
694
703
695
704
var system = game . System ;
@@ -725,6 +734,7 @@ private bool LoadXML(string path, CoreComm nextComm, HawkFile file, string force
725
734
}
726
735
catch ( Exception ex )
727
736
{
737
+ xmlGame = null ;
728
738
try
729
739
{
730
740
// need to get rid of this hack at some point
@@ -886,8 +896,18 @@ public bool LoadRom(string path, CoreComm nextComm, string launchLibretroCore, s
886
896
LoadM3U ( path , nextComm , file , forcedCoreName , out nextEmulator , out game ) ;
887
897
break ;
888
898
case ".xml" :
889
- if ( ! LoadXML ( path , nextComm , file , forcedCoreName , out nextEmulator , out rom , out game ) )
899
+ if ( ! LoadXML (
900
+ path ,
901
+ nextComm ,
902
+ file ,
903
+ forcedCoreName ,
904
+ out nextEmulator ,
905
+ out rom ,
906
+ out game ,
907
+ out XMLGameInfo ) )
908
+ {
890
909
return false ;
910
+ }
891
911
break ;
892
912
case ".psf" :
893
913
case ".minipsf" :
0 commit comments