From 1e118bee6d410129651153e97024268d2371f6b7 Mon Sep 17 00:00:00 2001
From: Vitor Santos Costa <vsc@dcc.fc.up.pt>
Date: Tue, 30 Aug 2016 11:03:42 -0500
Subject: [PATCH] slots

---
 CXX/yapi.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/CXX/yapi.cpp b/CXX/yapi.cpp
index b1c4361f3..85d9a4eb8 100644
--- a/CXX/yapi.cpp
+++ b/CXX/yapi.cpp
@@ -553,17 +553,15 @@ bool YAPQuery::next() {
 
   if (q_state == 0) {
     result = (bool)YAP_EnterGoal((YAP_PredEntryPtr)ap, q_g, &q_h);
-
   } else {
     LOCAL_AllowRestart = q_open;
     result = (bool)YAP_RetryGoal(&q_h);
   }
-  {
-    if (result)
-      __android_log_print(ANDROID_LOG_INFO, "YAPDroid", "vnames  %d %s %d",
+  if (result) {
+    __android_log_print(ANDROID_LOG_INFO, "YAPDroid", "vnames  %d %s %d",
                           q_state, vnames.text(), LOCAL_CurSlot);
-    else
-      __android_log_print(ANDROID_LOG_INFO, "YAPDroid", "fail");
+  } else {
+    __android_log_print(ANDROID_LOG_INFO, "YAPDroid", "fail");
   }
   q_state = 1;
   if (Yap_GetException()) {
@@ -573,6 +571,7 @@ bool YAPQuery::next() {
 
   if (!result) {
     YAP_LeaveGoal(FALSE, &q_h);
+    Yap_CloseHandles(q_handles);
     q_open = false;
   } else {
     q_handles = Yap_StartSlots();
@@ -618,6 +617,7 @@ void YAPQuery::close() {
   }
   YAP_LeaveGoal(FALSE, &q_h);
   q_open = 0;
+  Yap_CloseHandles(q_handles);
   // LOCAL_execution = this;
   RECOVER_MACHINE_REGS();
 }