Workaround the for the illegal state with null seek and non-null cach…

…ed tableSettings.
aiannacc · Sep 5, 2013 · de0a082 · de0a082
1 parent 1f24cab
commit de0a082
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/ext/automatch.js b/src/ext/automatch.js
@@ -515,11 +515,11 @@ loadAutomatchModule = function (gs, conn, mtgRoom, zch) {
     gs.AM.cancelSeek = function (seek) {
         if (gs.AM.state.seek !== null) {
             gs.AM.state.seek.canceling = true;
-            gs.AM.tableSettings = null;
             gs.AM.ws.sendMessage('CANCEL_SEEK',
                 {seekid: gs.AM.state.seek.seekid},
                 function () { gs.AM.state.seek = null; });
         }
+        gs.AM.tableSettings = null;
     };
 
     gs.AM.acceptOffer = function (aoCallback) {

diff --git a/src/ext/automatchSeekPop.js b/src/ext/automatchSeekPop.js
@@ -255,12 +255,12 @@
             visible = true;
         }
 
-        if (gs.AM.tableSettings === null) {
-            $('#seekPop').dialog(visible ? 'open' : 'close');
-            $('#seekhide').focus();
-        } else {
+        if (gs.AM.state.seek !== null && gs.AM.tableSettings !== null) {
             $('#seekAAPop').dialog(visible ? 'open' : 'close');
             $('#seekAAOkay').focus();
+        } else {
+            $('#seekPop').dialog(visible ? 'open' : 'close');
+            $('#seekhide').focus();
         }
     };
 }());