CUERipper was forgetting format and always choosing flac at startup.

This commit is contained in:
Grigory Chudov
2013-04-15 00:10:05 -04:00
parent e480b1612e
commit 12e6507ef0

View File

@@ -32,6 +32,7 @@ namespace CUERipper
private CUEControls.ShellIconMgr m_icon_mgr; private CUEControls.ShellIconMgr m_icon_mgr;
private bool testAndCopy = false; private bool testAndCopy = false;
internal CUERipperData data = new CUERipperData(); internal CUERipperData data = new CUERipperData();
private bool initDone = false;
public readonly static XmlSerializerNamespaces xmlEmptyNamespaces = new XmlSerializerNamespaces(new XmlQualifiedName[] { XmlQualifiedName.Empty }); public readonly static XmlSerializerNamespaces xmlEmptyNamespaces = new XmlSerializerNamespaces(new XmlQualifiedName[] { XmlQualifiedName.Empty });
public readonly static XmlWriterSettings xmlEmptySettings = new XmlWriterSettings { Indent = true, OmitXmlDeclaration = true }; public readonly static XmlWriterSettings xmlEmptySettings = new XmlWriterSettings { Indent = true, OmitXmlDeclaration = true };
@@ -150,10 +151,6 @@ namespace CUERipper
//_config.preserveHTOA = sr.LoadBoolean("PreserveHTOA") ?? false; //_config.preserveHTOA = sr.LoadBoolean("PreserveHTOA") ?? false;
//_config.createM3U = sr.LoadBoolean("CreateM3U") ?? true; //_config.createM3U = sr.LoadBoolean("CreateM3U") ?? true;
bindingSourceCR.DataSource = data;
bnComboBoxDrives.ImageList = m_icon_mgr.ImageList;
bnComboBoxFormat.ImageList = m_icon_mgr.ImageList;
try try
{ {
using (TextReader reader = new StringReader(sr.Load("CUERipper"))) using (TextReader reader = new StringReader(sr.Load("CUERipper")))
@@ -164,6 +161,10 @@ namespace CUERipper
System.Diagnostics.Trace.WriteLine(ex.Message); System.Diagnostics.Trace.WriteLine(ex.Message);
} }
bindingSourceCR.DataSource = data;
initDone = true;
bnComboBoxDrives.ImageList = m_icon_mgr.ImageList;
bnComboBoxFormat.ImageList = m_icon_mgr.ImageList;
SetupControls(); SetupControls();
@@ -1107,6 +1108,8 @@ namespace CUERipper
if (SelectedOutputAudioFmt == null) if (SelectedOutputAudioFmt == null)
return; return;
if (initDone)
{
switch (SelectedOutputAudioType) switch (SelectedOutputAudioType)
{ {
case AudioEncoderType.Lossless: case AudioEncoderType.Lossless:
@@ -1118,6 +1121,7 @@ namespace CUERipper
case AudioEncoderType.Hybrid: case AudioEncoderType.Hybrid:
cueRipperConfig.DefaultHybridFormat = SelectedOutputAudioFormat; cueRipperConfig.DefaultHybridFormat = SelectedOutputAudioFormat;
break; break;
}
} }
data.Encoders.RaiseListChangedEvents = false; data.Encoders.RaiseListChangedEvents = false;