1 files changed, 4 insertions, 1 deletions
diff --git a/modules-available/roomplanner/clientscript.js b/modules-available/roomplanner/clientscript.js
index 1b184753..f54434f2 100644
--- a/modules-available/roomplanner/clientscript.js
+++ b/modules-available/roomplanner/clientscript.js
@@ -123,6 +123,7 @@ function onBtnSelect() {
         var result = {muuid: value.machineuuid, ip: value.clientip, mac_address : value.macaddr, hostname: value.hostname};
 
         currentCallback(result);
+        currentCallback = null;
 
         $modal.modal('hide');
         clearSubnetBox();
@@ -136,7 +137,9 @@ function selectMachine(usedUuids, callback) {
     placedMachines =  usedUuids;
     $modal.modal('show');
     $modal.one('hidden.bs.modal', function () {
-        currentCallback(false);
+        if (currentCallback != null) {
+            currentCallback(false);
+        }
     });
 }