Index: C:/Documents and Settings/KenM/workspace_tasks/L2_GameServer_c4/java/net/sf/l2j/gameserver/model/actor/instance/L2PcInstance.java
===================================================================
--- C:/Documents and Settings/KenM/workspace_tasks/L2_GameServer_c4/java/net/sf/l2j/gameserver/model/actor/instance/L2PcInstance.java	(revision 1938)
+++ C:/Documents and Settings/KenM/workspace_tasks/L2_GameServer_c4/java/net/sf/l2j/gameserver/model/actor/instance/L2PcInstance.java	(working copy)
@@ -5420,12 +5420,12 @@
 		}
         
         // If a skill is currently being used, queue this one.
-        if (getCurrentSkill() != null)
+        if ((getCurrentSkill() != null) && (isCastingNow()))
         {
             if (skill.getId() == getCurrentSkill().getSkillId())
                 return;
             
-            setCurrentSkill(null, false, false);
+            //setCurrentSkill(null, false, false);
             setQueuedSkill(skill, forceUse, dontMove);
             return;
         }