From e1d43133dc56ded6fce324f5e153b55fbe4a9ce7 Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@4f64403b-2f21-0410-a795-97e2b3489a10>
Date: Sun, 20 Mar 2011 04:25:10 +0000
Subject: Fixed update detection

git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@590 4f64403b-2f21-0410-a795-97e2b3489a10
---
 updater/scan.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'updater/scan.cpp')

diff --git a/updater/scan.cpp b/updater/scan.cpp
index 395b3a7..ac068ca 100644
--- a/updater/scan.cpp
+++ b/updater/scan.cpp
@@ -116,7 +116,12 @@ void ScanPlugins(FilenameMap *fn_map, UpdateList *update_list)
                         int file_id = FindFileID(alternateName, MC_PLUGINS, update_list);
 						if (file_id != -1) 
                         {
-							RegisterForFileListing(file_id, alternateName, pluginInfo->version, true, MC_PLUGINS);
+							found = true;
+							if (FindFileInList(pluginInfo->shortName) >= 0)
+								RegisterForFileListing(file_id, pluginInfo->shortName, pluginInfo->version, true, MC_PLUGINS);
+							else
+								RegisterForFileListing(file_id, alternateName, pluginInfo->version, true, MC_PLUGINS);
+
                             if (fn_map)
                             {
                                 FileNameStruct* fns = fn_map->find((FileNameStruct*)&file_id);
@@ -126,7 +131,6 @@ void ScanPlugins(FilenameMap *fn_map, UpdateList *update_list)
                                     fn_map->insert(fns);
                                 }
                                 fns->list.insert(mir_tstrdup(findData.cFileName));
-								found = true;
                             }
 						}
 						mir_free(alternateName);
@@ -134,7 +138,7 @@ void ScanPlugins(FilenameMap *fn_map, UpdateList *update_list)
 
                     if (!found) 
                     {
-                        int file_id = FindFileID(pluginInfo->shortName, MC_PLUGINS, update_list);
+						int file_id = FindFileID(pluginInfo->shortName, MC_PLUGINS, update_list);
 						if (file_id != -1) 
                         {
 							RegisterForFileListing(file_id, pluginInfo, true);
-- 
cgit v1.2.3