SF.net SVN: geany:[5824] trunk

[eht16 at users.sourceforge.net]

Revision: 5824
          http://geany.svn.sourceforge.net/geany/?rev=5824&view=rev
Author:   eht16
Date:     2011-05-29 19:45:16 +0000 (Sun, 29 May 2011)

Log Message:
-----------
Do not add active plugins to the list of plugins when they are already in the list (closes #3308191).

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/plugins.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2011-05-29 19:38:47 UTC (rev 5823)
+++ trunk/ChangeLog	2011-05-29 19:45:16 UTC (rev 5824)
@@ -6,6 +6,8 @@
  * src/plugins.c:
    Define and use get_plugin_path() always and move platform dependent
    code into the function definition.
+   Do not add active plugins to the list of plugins when they are
+   already in the list (closes #3308191).
 
 
 2011-05-27  Colomban Wendling  <colomban(at)geany(dot)org>

Modified: trunk/src/plugins.c
===================================================================
--- trunk/src/plugins.c	2011-05-29 19:38:47 UTC (rev 5823)
+++ trunk/src/plugins.c	2011-05-29 19:45:16 UTC (rev 5824)
@@ -659,7 +659,13 @@
 	{
 		geany_debug("Plugin \"%s\" already loaded.", fname);
 		if (add_to_list)
+		{
+			/* do not add the to list twice */
+			if (g_list_find(plugin_list, plugin) != NULL)
+				return NULL;
+
 			plugin_list = g_list_prepend(plugin_list, plugin);
+		}
 		return plugin;
 	}
 


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