[geany/geany-plugins] a1c7ae: Merge pull request #804 from b4n/geanynumberedbookmarks/reunload-crash

[Frank Lanitz]

Branch:      refs/heads/master
Author:      Frank Lanitz <frank at frank.uvena.de>
Committer:   GitHub <noreply at github.com>
Date:        Thu, 20 Dec 2018 14:29:21 UTC
Commit:      a1c7aefbd6e7a30f292c6e0ed6701e6012f68959
             https://github.com/geany/geany-plugins/commit/a1c7aefbd6e7a30f292c6e0ed6701e6012f68959

Log Message:
-----------
Merge pull request #804 from b4n/geanynumberedbookmarks/reunload-crash

GeanyNumberedBookmarks: Fix crash on re-unload


Modified Paths:
--------------
    geanynumberedbookmarks/src/geanynumberedbookmarks.c

Modified: geanynumberedbookmarks/src/geanynumberedbookmarks.c
5 lines changed, 4 insertions(+), 1 deletions(-)
===================================================================
@@ -1554,7 +1554,9 @@ void plugin_cleanup(void)
 	for(i=0;i<GEANY(documents_array)->len;i++)
 		if(documents[i]->is_valid) {
 			sci=documents[i]->editor->sci;
-			markers=GetMarkersUsed(sci);
+			markers=g_object_steal_data(G_OBJECT(sci), "Geany_Numbered_Bookmarks_Used");
+			if(!markers)
+				continue;
 			for(k=2;k<25;k++)
 				if(((*markers)&(1<<k))!=0)
 					scintilla_send_message(sci,SCI_MARKERDELETEALL,k,0);
@@ -1576,6 +1578,7 @@ void plugin_cleanup(void)
 		g_free(fdTemp);
 		fdTemp=fdTemp2;
 	}
+	fdKnownFilesSettings = NULL;
 
 	/* free memory used for settings */
 	g_free(FileDetailsSuffix);



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).