pjax: Cancel auto refresh on manual refresh

scp/js/scp.js

@@ -632,8 +632,7 @@ getConfig = (function() {
 })();
 
 $(document).on('pjax:click', function(options) {
-    if (window.ticket_refresh !== undefined)
-        clearInterval(window.ticket_refresh);
+    clearTimeout(window.ticket_refresh);
     // Release ticket lock (maybe)
     if ($.autoLock !== undefined)
         $.autoLock.releaseLock();

scp/tickets.php

@@ -620,7 +620,8 @@ if($ticket) {
 
     //set refresh rate if the user has it configured
     if(!$_POST && !$_REQUEST['a'] && ($min=$thisstaff->getRefreshRate())) {
-        $js = "window.ticket_refresh = setTimeout($.refreshTicketView,"
+        $js = "clearTimeout(window.ticket_refresh);
+               window.ticket_refresh = setTimeout($.refreshTicketView,"
             .($min*60000).");";
         $ost->addExtraHeader('<script type="text/javascript">'.$js.'</script>',
             $js);