widget.bat: put {batteries,ac} back to local

[etc/awesome.git] / util / quake.lua

diff --git a/util/quake.lua b/util/quake.lua
index c98f28dba717ada8e617c0fe28d58fde692002f0..e3237320a7990dae8828fa4a973bad7ce40f41fc 100644 (file)
--- a/util/quake.lua
+++ b/util/quake.lua
@@ -1,7 +1,7 @@
 --[[
 
      Licensed under GNU General Public License v2
-      * (c) 2016, Luke Bonham
+      * (c) 2016, Luca CPZ
       * (c) 2015, unknown
 
 --]]
@@ -26,8 +26,6 @@ local quake = {}
 
 function quake:display()
     if self.followtag then self.screen = awful.screen.focused() end
-    local toscan = self.screen
-    if self.onlyone then toscan = nil end
 
     -- First, we locate the client
     local client = nil
@@ -35,7 +33,7 @@ function quake:display()
     for c in awful.client.iterate(function (c)
         -- c.name may be changed!
         return c.instance == self.name
-    end, nil, toscan)
+    end)
     do
         i = i + 1
         if i == 1 then
@@ -129,7 +127,6 @@ function quake:new(config)
     conf.border     = conf.border    or 1          -- client border width
     conf.visible    = conf.visible   or false      -- initially not visible
     conf.followtag  = conf.followtag or false      -- spawn on currently focused screen
-    conf.onlyone    = conf.onlyone   or false      -- one instance for all screens
     conf.overlap    = conf.overlap   or false      -- overlap wibox
     conf.screen     = conf.screen    or awful.screen.focused()
     conf.settings   = conf.settings
@@ -161,7 +158,10 @@ function quake:toggle()
      if self.followtag then self.screen = awful.screen.focused() end
      local current_tag = self.screen.selected_tag
      if current_tag and self.last_tag ~= current_tag and self.visible then
-         self:display():move_to_tag(current_tag)
+         local c=self:display()
+         if c then
+            c:move_to_tag(current_tag)
+        end
      else
          self.visible = not self.visible
          self:display()