X-Git-Url: https://jasonwoof.com/gitweb/?p=ckeditor.git;a=blobdiff_plain;f=_source%2Fplugins%2Fmenu%2Fplugin.js;h=265604c15d6fd865239fdf18491e8c22a3cf4c9e;hp=0165d31041297c431818dc672e997019b615397a;hb=2f22c0c38f17e75be5541089076885442aaa2377;hpb=e73319a12b56100b29ef456fd74114fe5519e01c

diff --git a/_source/plugins/menu/plugin.js b/_source/plugins/menu/plugin.js
index 0165d31..265604c 100644
--- a/_source/plugins/menu/plugin.js
+++ b/_source/plugins/menu/plugin.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
@@ -175,10 +175,11 @@ CKEDITOR.plugins.add( 'menu',
 
 			onHide : function()
 			{
-				if ( CKEDITOR.env.ie )
+				// Unlock the selection upon first panel closing.
+				if ( CKEDITOR.env.ie && !this.parent )
 				{
 					var selection = this.editor.getSelection();
-					selection && selection.unlock();
+					selection && selection.unlock( true );
 				}
 
 				this.onHide && this.onHide();