[Mp-plugins-svn] SF.net SVN: mp-plugins: [1138] trunk/plugins/WorldMap

[<lk...@us...>]

Revision: 1138
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1138&view=rev
Author:   lkuech
Date:     2007-12-10 04:51:05 -0800 (Mon, 10 Dec 2007)

Log Message:
-----------
FIX: Exception appeared when closing MP with WorldMap in foreground
FIX: Better handling of empty SearchResults (GeoCodes)
FIX: "IP Blocked" bitmap was not always shown

Modified Paths:
--------------
    trunk/plugins/WorldMap/MAPS/SearchGeoCodes.cs
    trunk/plugins/WorldMap/MAPS/ThreadedDownload.cs
    trunk/plugins/WorldMap/WorldMap.cs
    trunk/plugins/WorldMap/WorldMapSearchResults.cs
    trunk/plugins/WorldMap/WorldmapMenu.cs
    trunk/plugins/WorldMap/WorldmapSearch.cs

Modified: trunk/plugins/WorldMap/MAPS/SearchGeoCodes.cs
===================================================================
--- trunk/plugins/WorldMap/MAPS/SearchGeoCodes.cs	2007-12-10 07:26:11 UTC (rev 1137)
+++ trunk/plugins/WorldMap/MAPS/SearchGeoCodes.cs	2007-12-10 12:51:05 UTC (rev 1138)
@@ -84,9 +84,9 @@
 
     public void PushYahooResultToSearchResult(string XMLString)
     {
-      if (XMLString == null) return;
       SearchResult = new List<GeoCode>();
       SearchResult.Clear();
+      if (XMLString == null) return;
       
       XmlDocument doc = new XmlDocument();
       doc.LoadXml(XMLString);
@@ -121,6 +121,8 @@
       SearchResult = new List<GeoCode>();
       SearchResult.Clear();
 
+      if (XMLString == null) return;
+
       XmlDocument doc = new XmlDocument();
       doc.LoadXml(XMLString);
 

Modified: trunk/plugins/WorldMap/MAPS/ThreadedDownload.cs
===================================================================
--- trunk/plugins/WorldMap/MAPS/ThreadedDownload.cs	2007-12-10 07:26:11 UTC (rev 1137)
+++ trunk/plugins/WorldMap/MAPS/ThreadedDownload.cs	2007-12-10 12:51:05 UTC (rev 1138)
@@ -311,7 +311,15 @@
           httpResponse = (HttpWebResponse)httpRequest.GetResponse();
           tmpImageStream = httpResponse.GetResponseStream();
 
-          tmpTileImage = new Bitmap(tmpImageStream);
+          try
+          {
+            tmpTileImage = new Bitmap(tmpImageStream);
+          }
+          catch (Exception)
+          {
+            tmpImage.Image = mapConfig.IPBlocked;
+          }
+
           if (tmpImage.MapType == MapFunctions.MapType.GMHybrid)
           {
             cacheDatabase.InsertImage("gma", tmpImage.PosX, tmpImage.PosY, tmpImage.ZoomLevel, tmpTileImage);

Modified: trunk/plugins/WorldMap/WorldMap.cs
===================================================================
--- trunk/plugins/WorldMap/WorldMap.cs	2007-12-10 07:26:11 UTC (rev 1137)
+++ trunk/plugins/WorldMap/WorldMap.cs	2007-12-10 12:51:05 UTC (rev 1138)
@@ -289,7 +289,8 @@
     {
       if(IsNotWorldmapWindow(new_windowId))
       {
-        SaveSettingsAndFreeRessources();
+        bool MPisClosing = (new_windowId == 0);
+        SaveSettingsAndFreeRessources(MPisClosing);
       }
     }
 
@@ -302,7 +303,7 @@
       else return false;
     }
 
-    public void SaveSettingsAndFreeRessources()
+    public void SaveSettingsAndFreeRessources(bool MPisClosing)
     {
       settings.DaysToKeepCachedDetailedTiles = mapConfig.DaysToKeepCachedDetailedTiles;
       settings.DaysToKeepCachedOverviewTiles = mapConfig.DaysToKeepCachedOverviewTiles;
@@ -328,8 +329,14 @@
 
       mapTiles.ClearTileDownloadQueue();
 
-      using (WaitCursor cursor = new WaitCursor()) mapTiles.ImageGrabber.cacheDatabase.DeleteOldCacheEntries();
-
+      if (MPisClosing)
+      {
+        mapTiles.ImageGrabber.cacheDatabase.DeleteOldCacheEntries();
+      }
+      else
+      {
+        using (WaitCursor cursor = new WaitCursor()) mapTiles.ImageGrabber.cacheDatabase.DeleteOldCacheEntries();
+      }
       mapTiles = null;
 
       ProgressBarActiveTexture.Dispose();

Modified: trunk/plugins/WorldMap/WorldMapSearchResults.cs
===================================================================
--- trunk/plugins/WorldMap/WorldMapSearchResults.cs	2007-12-10 07:26:11 UTC (rev 1137)
+++ trunk/plugins/WorldMap/WorldMapSearchResults.cs	2007-12-10 12:51:05 UTC (rev 1138)
@@ -99,7 +99,8 @@
 
       if (tmpMainWindow.IsNotWorldmapWindow(new_windowId))
       {
-        tmpMainWindow.SaveSettingsAndFreeRessources();
+        bool MPisClosing = (new_windowId == 0);
+        tmpMainWindow.SaveSettingsAndFreeRessources(MPisClosing);
       }
     }
 

Modified: trunk/plugins/WorldMap/WorldmapMenu.cs
===================================================================
--- trunk/plugins/WorldMap/WorldmapMenu.cs	2007-12-10 07:26:11 UTC (rev 1137)
+++ trunk/plugins/WorldMap/WorldmapMenu.cs	2007-12-10 12:51:05 UTC (rev 1138)
@@ -64,7 +64,8 @@
 
       if (tmpMainWindow.IsNotWorldmapWindow(new_windowId))
       {
-        tmpMainWindow.SaveSettingsAndFreeRessources();
+        bool MPisClosing = (new_windowId == 0);
+        tmpMainWindow.SaveSettingsAndFreeRessources(MPisClosing);
       }
     }
 

Modified: trunk/plugins/WorldMap/WorldmapSearch.cs
===================================================================
--- trunk/plugins/WorldMap/WorldmapSearch.cs	2007-12-10 07:26:11 UTC (rev 1137)
+++ trunk/plugins/WorldMap/WorldmapSearch.cs	2007-12-10 12:51:05 UTC (rev 1138)
@@ -113,7 +113,8 @@
 
       if (tmpMainWindow.IsNotWorldmapWindow(new_windowId))
       {
-        tmpMainWindow.SaveSettingsAndFreeRessources();
+        bool MPisClosing = (new_windowId == 0);
+        tmpMainWindow.SaveSettingsAndFreeRessources(MPisClosing);
       }
     }
 


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