Use clearer control flow

p-e-w · Oct 31, 2018 · a024acc · a024acc
1 parent 7c4ee44
commit a024acc
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/argos@pew.worldwidemann.com/button.js b/argos@pew.worldwidemann.com/button.js
@@ -138,11 +138,12 @@ var ArgosButton = new Lang.Class({
 
     this.actor.visible = buttonLines.length > 0 || !dropdownMode;
 
-    if (buttonLines.length === 0 && !dropdownMode) {
-      this._lineView.setMarkup(GLib.markup_escape_text(this._file.get_basename(), -1));
-    }
+    if (!this.actor.visible)
+  		return;
 
-    if (buttonLines.length === 1) {
+    if (buttonLines.length === 0) {
+      this._lineView.setMarkup(GLib.markup_escape_text(this._file.get_basename(), -1));
+    } else if (buttonLines.length === 1) {
       this._lineView.setLine(buttonLines[0]);
     } else if (buttonLines.length > 1) {
       this._lineView.setLine(buttonLines[0]);