Made whatever changes I did. Gotta go, dinner awaits.

This commit is contained in:
gb.luke 2010-07-04 18:17:05 +00:00
parent 1712c720e0
commit daad018539

View File

@ -22,7 +22,7 @@ namespace NUS_Downloader
private readonly string CURRENT_DIR = Directory.GetCurrentDirectory(); private readonly string CURRENT_DIR = Directory.GetCurrentDirectory();
// TODO: Always remember to change version! // TODO: Always remember to change version!
private string version = "v1.5a Beta"; private string version = "v2.0 Beta";
private WebClient generalWC = new WebClient(); private WebClient generalWC = new WebClient();
private static RijndaelManaged rijndaelCipher; private static RijndaelManaged rijndaelCipher;
private static bool dsidecrypt = false; private static bool dsidecrypt = false;
@ -31,6 +31,7 @@ namespace NUS_Downloader
private delegate void AddToolStripItemToStripCallback( private delegate void AddToolStripItemToStripCallback(
int type, ToolStripMenuItem additionitem, XmlAttributeCollection attributes); int type, ToolStripMenuItem additionitem, XmlAttributeCollection attributes);
private delegate void WriteStatusCallback(string Update); private delegate void WriteStatusCallback(string Update);
private delegate void BootChecksCallback();
// Images do not compare unless globalized... // Images do not compare unless globalized...
private Image green = Properties.Resources.bullet_green; private Image green = Properties.Resources.bullet_green;
@ -174,6 +175,14 @@ namespace NUS_Downloader
/// <returns></returns> /// <returns></returns>
private void BootChecks() private void BootChecks()
{ {
// Check if correct thread...
if (this.InvokeRequired)
{
Debug.WriteLine("InvokeRequired...");
BootChecksCallback bcc = new BootChecksCallback(BootChecks);
this.Invoke(bcc);
return;
}
// Check for Wii common key bin file... // Check for Wii common key bin file...
if (File.Exists(Path.Combine(CURRENT_DIR, "key.bin")) == false) if (File.Exists(Path.Combine(CURRENT_DIR, "key.bin")) == false)
{ {
@ -221,9 +230,12 @@ namespace NUS_Downloader
if (File.Exists(Path.Combine(CURRENT_DIR, "database.xml")) == false) if (File.Exists(Path.Combine(CURRENT_DIR, "database.xml")) == false)
{ {
WriteStatus("Database.xml not found. Title database not usable!"); WriteStatus("Database.xml not found. Title database not usable!");
databaseButton.Visible = false; //databaseButton.Visible = false;
Extrasbtn.Size = new System.Drawing.Size(134, 20); //Extrasbtn.Size = new System.Drawing.Size(134, 20);
updateDatabaseToolStripMenuItem.Text = "Download Database"; databaseButton.Click -= new System.EventHandler(this.button4_Click);
databaseButton.Click += new System.EventHandler(this.updateDatabaseToolStripMenuItem_Click);
databaseButton.Text = "Download DB";
//updateDatabaseToolStripMenuItem.Text = "Download Database";
} }
else else
{ {
@ -2006,6 +2018,7 @@ namespace NUS_Downloader
/// </summary> /// </summary>
private void LoadRegionCodes() private void LoadRegionCodes()
{ {
// TODO: make this check InvokeRequired...
XmlDocument xDoc = new XmlDocument(); XmlDocument xDoc = new XmlDocument();
xDoc.Load("database.xml"); xDoc.Load("database.xml");