fix x hotkey firing simultaneously with X

diff --git a/tt-rss.js b/tt-rss.js
index 3bc0ea4aba21113c5e87732884de098e8689a031..5884d8d4e3f79bb59c2cf5f8e37be2c37a2dfdf9 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -743,10 +743,12 @@ function hotkey_handler(e) {
 
                        if (keycode == 68 && shift_key) { // shift-D
                                dismissSelectedArticles();
+                               return;
                        }
 
                        if (keycode == 88 && shift_key) { // shift-X
                                dismissReadArticles();
+                               return;
                        }
 
                        if (keycode == 78 || keycode == 40) { // n, down
@@ -814,9 +816,10 @@ function hotkey_handler(e) {
                                }
                        }
 
-                       if (keycode == 88) { // x
+                       if (keycode == 88 && !shift_key) { // x
                                if (activeFeedIsCat()) {
                                        dijit.byId("feedTree").collapseCat(getActiveFeedId());
+                                       return;
                                }
                        }
                }