Merge remote-tracking branch 'refs/remotes/origin/master' into res-settings

This commit is contained in:
morkt
2018-01-10 17:32:19 +04:00
5 changed files with 7 additions and 4 deletions

View File

@@ -15,11 +15,14 @@ namespace GameRes.Formats.GUI
{
public WidgetXP3 ()
{
var last_selected = Properties.Settings.Default.XP3Scheme;
InitializeComponent();
var keys = new[] { new KeyValuePair<string, ICrypt> (arcStrings.ArcNoEncryption, Xp3Opener.NoCryptAlgorithm) };
this.DataContext = keys.Concat (Xp3Opener.KnownSchemes.OrderBy (x => x.Key));
this.Loaded += (s, e) => {
if (-1 == this.Scheme.SelectedIndex)
if (!string.IsNullOrEmpty (last_selected))
this.Scheme.SelectedValue = last_selected;
else
this.Scheme.SelectedIndex = 0;
};
}

View File

@@ -134,7 +134,7 @@ namespace GameRes.Formats.Malie
public DatOpener ()
{
Extensions = new string[] { "lib", "dat" };
Signatures = new uint[] { 0, 0x3F503FB1, 0xC237434E };
Signatures = new uint[] { 0, 0x3F503FB1, 0xC237434E, 0x8CD11522 };
}
public override ArcFile TryOpen (ArcView file)

View File

Binary file not shown.