From bb6267bbe4d96978c9df8274891ec9f734b94f8f Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Tue, 12 Oct 2010 21:53:41 +0000 Subject: [PATCH] Fixed possible deadlock added in the mouse support code --- projects/mtg/src/DuelLayers.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/projects/mtg/src/DuelLayers.cpp b/projects/mtg/src/DuelLayers.cpp index 49cc0321a..a99e6351d 100644 --- a/projects/mtg/src/DuelLayers.cpp +++ b/projects/mtg/src/DuelLayers.cpp @@ -59,7 +59,7 @@ void DuelLayers::init(){ void DuelLayers::CheckUserInput(int isAI){ JButton key; int x, y; - while ((key = JGE::GetInstance()->ReadButton()) || JGE::GetInstance()->GetLeftClickCoordinates(x, y)) + while ((key = JGE::GetInstance()->ReadButton())) { if ((!isAI) && (0 != key)) { @@ -70,13 +70,12 @@ void DuelLayers::CheckUserInput(int isAI){ if (hand->CheckUserInput(key)) break; if (cs->CheckUserInput(key)) break; } - else if((!isAI) && (x != -1 && y != -1)) + } + if(JGE::GetInstance()->GetLeftClickCoordinates(x, y)) + { + if (cs->CheckUserInput(x, y)) { - if (cs->CheckUserInput(x, y)) - { - JGE::GetInstance()->LeftClickedProcessed(); - break; - } + JGE::GetInstance()->LeftClickedProcessed(); } } }