Merge lp:~compiz-team/compiz/compiz.fix_1193596 into lp:compiz/0.9.10

[Sam Spilsbury]

Only mark for no further instantiations once we've finished destructing
the plugin

(LP: #1193596)

Only mark for no further instantiations once we've finished destructing
the plugin

(LP: #1193596)

Note: I haven't had a chance to test this out - but based on the comments in the bug report and on my common knowledge of things, I'm like 99% sure this fixes the issue at hand.

Its also quite difficult to get this one section of the code under any kind of meaningful test.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3743
http://jenkins.qa.ubuntu.com/job/compiz-ci/209/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=raring,flavor=amd64/250/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-armhf-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-i386-ci/22

Click here to trigger a rebuild:
http://s-jenkins:8080/job/compiz-ci/209/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

=== modified file 'src/plugin.cpp'
--- src/plugin.cpp	2013-04-17 06:58:36 +0000
+++ src/plugin.cpp	2013-06-22 15:03:25 +0000
@@ -267,8 +267,6 @@
 void
 CompManager::finiPlugin (CompPlugin *p)
 {
-    p->vTable->markNoFurtherInstantiation ();
-
     if (screen)
     {
 	screen->finiPluginForScreen (p);
@@ -276,6 +274,7 @@
     }
 
     p->vTable->fini ();
+    p->vTable->markNoFurtherInstantiation ();
 }
 
 bool