Merge r4900 to trunk

This commit is contained in:
adelikat 2013-08-30 19:36:37 +00:00
parent 377650d68e
commit c5036bf057
1 changed files with 6 additions and 1 deletions

View File

@ -829,7 +829,7 @@ namespace BizHawk.MultiClient
{ {
get get
{ {
return Paths.FirstOrDefault(x => x.System.Contains(system) && x.Type == type); return Paths.FirstOrDefault(x => x.HasSystem(system) && x.Type == type);
} }
} }
@ -1042,6 +1042,11 @@ namespace BizHawk.MultiClient
public string System; public string System;
public int Ordinal; public int Ordinal;
public PathEntry() { } public PathEntry() { }
public bool HasSystem(string systemID)
{
string[] ids = System.Split('_');
return ids.Contains(systemID);
}
} }
public enum PLUGINTYPE { RICE, GLIDE, GLIDE64MK2 }; public enum PLUGINTYPE { RICE, GLIDE, GLIDE64MK2 };