[Mp-plugins-svn] SF.net SVN: mp-plugins: [536] trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt /Design/FileInfoScraperForm.cs

[<che...@us...>]

Revision: 536
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=536&view=rev
Author:   chef_koch
Date:     2007-06-13 14:54:37 -0700 (Wed, 13 Jun 2007)

Log Message:
-----------
first try to fix a null pointer exception
SelectBestMatch() will now use gameInfoURL for previous selected info item

Modified Paths:
--------------
    trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileInfoScraperForm.cs

Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileInfoScraperForm.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileInfoScraperForm.cs	2007-06-13 21:05:50 UTC (rev 535)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/FileInfoScraperForm.cs	2007-06-13 21:54:37 UTC (rev 536)
@@ -60,7 +60,7 @@
     #region Variables / Init
 
     int mStartTime = 0;
-    ApplicationItem m_CurApp;
+    ApplicationItem curApp;
 
     bool isSearching = false;
     bool stopSearching = false;
@@ -71,7 +71,7 @@
     {
       get
       {
-        return m_CurApp;
+        return curApp;
       }
       set
       {
@@ -81,10 +81,10 @@
 
     void SetCurApp(ApplicationItem value)
     {
-      m_CurApp = value;
-      if (m_CurApp != null)
+      curApp = value;
+      if (curApp != null)
       {
-        filterComboBox.Text = m_CurApp.SystemDefault;
+        filterComboBox.Text = curApp.SystemDefault;
       }
     }
 
@@ -153,14 +153,12 @@
           continue;
         }
 
-        /*
         // prevously selected infoitem
-        if (file.GameURL == info.GameURL)
+        if (file.GameInfoURL == info.GameURL)
         {
           file.FileInfoFavourite = info;
           continue;
         }
-        */
 
         // file has already a favourite
         // is info's relevance better than current favourite's relevance
@@ -184,6 +182,8 @@
 
     private void UpdateButtonStates()
     {
+      if (groupBoxFileList == null) return;
+
       // labels to update
       groupBoxFileList.Text = String.Format("Files ({0} of {1} selected)", listViewFileList.CheckedItems.Count, listViewFileList.Items.Count);
 
@@ -235,7 +235,7 @@
 
     private void SyncFileList()
     {
-      if (m_CurApp == null) return;
+      if (curApp == null) return;
       
       listViewFileList.BeginUpdate();
       try
@@ -243,7 +243,7 @@
         listViewFileList.Items.Clear();
 
         // add all files
-        foreach (FileItem file in m_CurApp.Files)
+        foreach (FileItem file in curApp.Files)
         {
           ListViewItem curItem = new ListViewItem(file.Title);
           file.ToFileInfoFavourite();
@@ -424,9 +424,9 @@
 
     private void buttonClose_Click(object sender, EventArgs e)
     {
-      if ((m_CurApp != null) && (filterComboBox.Text != ""))
+      if ((curApp != null) && (filterComboBox.Text != ""))
       {
-        m_CurApp.SystemDefault = filterComboBox.Text;
+        curApp.SystemDefault = filterComboBox.Text;
         //m_CurApp.Write();
       }
       this.Close();
@@ -655,7 +655,7 @@
           }
           curItem.SubItems[1].Text = String.Format("<searching...>");
           System.Windows.Forms.Application.DoEvents();
-          file.FindFileInfoDetail(m_CurApp, file.FileInfoFavourite, ScraperType.ALLGAME, saveType);
+          file.FindFileInfoDetail(curApp, file.FileInfoFavourite, ScraperType.ALLGAME, saveType);
           if ((saveType == ScraperSaveType.DataAndImages) || (saveType == ScraperSaveType.Data))
           {
             file.SaveFromFileInfoFavourite();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.