Improved check for global plugins vs local plugins to use full pathnames

nickgammon · Jun 10, 2011 · c881cff · c881cff
1 parent bf9c23b
commit c881cff
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/doc.cpp b/doc.cpp
@@ -827,6 +827,7 @@ void CMUSHclientDoc::SetUpOutputWindow (void)
     for (vector<string>::const_iterator i = v.begin (); i != v.end (); i++)
       {
       strPath = i->c_str ();
+      string sGlobalPluginPath (Make_Absolute_Path (strPath));
       bool bAlreadyLoaded = false;
 
       // see if we already have this one
@@ -835,8 +836,10 @@ void CMUSHclientDoc::SetUpOutputWindow (void)
            ++pit)
         {
         CPlugin * p = *pit;
+        // convert filename to absolute path for a better comparison
+        string sThisPluginPath (Make_Absolute_Path (p->m_strSource));
 
-        if (p->m_strSource == strPath)
+        if (sGlobalPluginPath == sThisPluginPath)
           {
            bAlreadyLoaded = true;
            p->m_bGlobal = true;
@@ -853,8 +856,10 @@ void CMUSHclientDoc::SetUpOutputWindow (void)
              ++pit)
           {
           CPlugin * p = *pit;
+          // convert filename to absolute path for a better comparison
+          string sThisPluginPath (Make_Absolute_Path (p->m_strSource));
 
-          if (p->m_strSource == strPath)
+          if (sGlobalPluginPath == sThisPluginPath)
             {
              p->m_bGlobal = true;
              break;