Merge lp:~sil2100/compiz-core/fix-988684-0.9.7 into lp:compiz-core

[Łukasz Zemczak]

Cherry-picked from compiz trunk (rev 3115):
Don't clear selections in ~PrivateScreen because it causes a race between the existing and the new compiz instances, breaking --replace and non-replace behaviour. (LP: #988684) (LP: #989545)

Cherry-picked from trunk, original description:

Don't clear selections in ~PrivateScreen because it causes a race between
the existing and the new compiz instances, breaking --replace and non-replace
behaviour. (LP: #988684) (LP: #989545)

This simply deletes two lines of code I introduced in my cleanup r3108.

[Daniel van Vugt (vanvugt)]

Rejected. Most of the fix is missing because the bug itself does not exist in 0.9.7!

https://bugs.launchpad.net/compiz-core/+bug/988684/comments/5

review: Disapprove

[Daniel van Vugt (vanvugt)]

Also, the call to XFreeCursor is actually not required. It will be freed by XCloseDisplay().

[Łukasz Zemczak (sil2100)]

Excellent, thanks for the info!

Unmerged revisions

3104. By Łukasz Zemczak on 2012-06-19

Cherry-picked from compiz trunk (rev 3115):
Don't clear selections in ~PrivateScreen because it causes a race between the existing and the new compiz instances, breaking --replace and non-replace behaviour. (LP: #988684) (LP: #989545)

=== modified file 'src/screen.cpp'
--- src/screen.cpp	2012-03-30 06:26:33 +0000
+++ src/screen.cpp	2012-06-19 14:34:26 +0000
@@ -5224,6 +5224,9 @@
 	if (snContext)
 	    sn_monitor_context_unref (snContext);
 
+	if (invisibleCursor != None)
+	    XFreeCursor (dpy, invisibleCursor);
+
 	XCloseDisplay (dpy);
     }